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>
This commit is contained in:
Adam C. Emerson 2020-03-21 12:51:58 -04:00
parent 674a6f6309
commit 0b1935bc3f
6 changed files with 6 additions and 6 deletions

View File

@ -22,7 +22,7 @@
#include "crypto/crypto_accel.h"
// -----------------------------------------------------------------------------
class CryptoPlugin : public Plugin {
class CryptoPlugin : public ceph::Plugin {
public:
CryptoAccelRef cryptoaccel;

View File

@ -28,7 +28,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 ISALCryptoPlugin(cct));
}

View File

@ -31,7 +31,7 @@ public:
~ISALCryptoPlugin()
{}
virtual int factory(CryptoAccelRef *cs,
ostream *ss)
std::ostream *ss)
{
if (cryptoaccel == nullptr)
{

View File

@ -23,7 +23,7 @@
#undef dout_prefix
#define dout_prefix _prefix(_dout)
static ostream&
static std::ostream&
_prefix(std::ostream* _dout)
{
return *_dout << "OpensslCryptoAccel: ";

View File

@ -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));
}

View File

@ -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);