From: Michael Lee Date: Thu, 28 Jan 2016 18:52:42 +0000 (-0800) Subject: Add (void)ssl back to SSLContext for -Wunused-parameter X-Git-Tag: deprecate-dynamic-initializer~127 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=08dba5714790020d2fa677e34e624eb4f34a20ca;p=folly.git Add (void)ssl back to SSLContext for -Wunused-parameter Summary: I'm not sure what accepted practice is to make the -Wunused-parameter not balk. Reviewed By: igorsugak Differential Revision: D2874705 fb-gh-sync-id: 8765bae504fd90dfd8896857f4bf865ca8f64a8a --- diff --git a/folly/io/async/SSLContext.cpp b/folly/io/async/SSLContext.cpp index 788491c0..19c0aa53 100644 --- a/folly/io/async/SSLContext.cpp +++ b/folly/io/async/SSLContext.cpp @@ -570,13 +570,13 @@ bool SSLContext::canUseFalseStartWithCipher(const SSL_CIPHER *cipher) { } #endif -int SSLContext::selectNextProtocolCallback(SSL* /* ssl */, +int SSLContext::selectNextProtocolCallback(SSL* ssl, unsigned char** out, unsigned char* outlen, const unsigned char* server, unsigned int server_len, void* data) { - + (void)ssl; // Make -Wunused-parameters happy SSLContext* ctx = (SSLContext*)data; if (ctx->advertisedNextProtocols_.size() > 1) { VLOG(3) << "SSLContext::selectNextProcolCallback() "