diff options
author | Adam C. Emerson <aemerson@redhat.com> | 2020-03-21 17:51:58 +0100 |
---|---|---|
committer | Adam C. Emerson <aemerson@redhat.com> | 2020-03-22 05:28:39 +0100 |
commit | 0b1935bc3fec1901126258d3f41fd44ead447db8 (patch) | |
tree | ad7673b283561302be5e8a78ab010f26523305b3 /src/crypto/openssl | |
parent | compressor: Build without using namespace declarations in headers (diff) | |
download | ceph-0b1935bc3fec1901126258d3f41fd44ead447db8.tar.xz ceph-0b1935bc3fec1901126258d3f41fd44ead447db8.zip |
crypto: Build without using namespace declarations in headers
This is part of a series of commits to clean up using namespace at top
level in headers.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Diffstat (limited to 'src/crypto/openssl')
-rw-r--r-- | src/crypto/openssl/openssl_crypto_accel.cc | 2 | ||||
-rw-r--r-- | src/crypto/openssl/openssl_crypto_plugin.cc | 2 | ||||
-rw-r--r-- | src/crypto/openssl/openssl_crypto_plugin.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/crypto/openssl/openssl_crypto_accel.cc b/src/crypto/openssl/openssl_crypto_accel.cc index 2eae7530684..e6ea0fa7290 100644 --- a/src/crypto/openssl/openssl_crypto_accel.cc +++ b/src/crypto/openssl/openssl_crypto_accel.cc @@ -23,7 +23,7 @@ #undef dout_prefix #define dout_prefix _prefix(_dout) -static ostream& +static std::ostream& _prefix(std::ostream* _dout) { return *_dout << "OpensslCryptoAccel: "; diff --git a/src/crypto/openssl/openssl_crypto_plugin.cc b/src/crypto/openssl/openssl_crypto_plugin.cc index a3ac5994d0e..e6ecea2fd9a 100644 --- a/src/crypto/openssl/openssl_crypto_plugin.cc +++ b/src/crypto/openssl/openssl_crypto_plugin.cc @@ -26,7 +26,7 @@ int __ceph_plugin_init(CephContext *cct, const std::string& type, const std::string& name) { - PluginRegistry *instance = cct->get_plugin_registry(); + auto instance = cct->get_plugin_registry(); return instance->add(type, name, new OpenSSLCryptoPlugin(cct)); } diff --git a/src/crypto/openssl/openssl_crypto_plugin.h b/src/crypto/openssl/openssl_crypto_plugin.h index cbf7274607e..408d9ebdaa7 100644 --- a/src/crypto/openssl/openssl_crypto_plugin.h +++ b/src/crypto/openssl/openssl_crypto_plugin.h @@ -25,7 +25,7 @@ class OpenSSLCryptoPlugin : public CryptoPlugin { public: explicit OpenSSLCryptoPlugin(CephContext* cct) : CryptoPlugin(cct) {} - int factory(CryptoAccelRef *cs, ostream *ss) override { + int factory(CryptoAccelRef *cs, std::ostream *ss) override { if (cryptoaccel == nullptr) cryptoaccel = CryptoAccelRef(new OpenSSLCryptoAccel); |