From dba10cbee723fae0ee13b30366e6b371fc5e13f3 Mon Sep 17 00:00:00 2001 From: "joth@chromium.org" Date: Fri, 15 Apr 2011 13:09:26 +0000 Subject: Fix openssl build In follow up to http://codereview.chromium.org/6805019/ fixes a couple namespace issues. BUG=None TEST=Builds with use_openssl=1 set. Review URL: http://codereview.chromium.org/6865011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81736 0039d316-1c4b-4281-b951-d872f2087c98 --- crypto/openssl_util.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crypto') diff --git a/crypto/openssl_util.cc b/crypto/openssl_util.cc index feb47ca..bdf24e6 100644 --- a/crypto/openssl_util.cc +++ b/crypto/openssl_util.cc @@ -34,8 +34,8 @@ class OpenSSLInitSingleton { // we can't control the order the AtExit handlers will run in so // allowing the global environment to leak at least ensures it is // available for those other singletons to reliably cleanup. - return base::Singleton >::get(); + return Singleton >::get(); } private: friend struct DefaultSingletonTraits; @@ -85,7 +85,7 @@ class OpenSSLInitSingleton { // error queue and return, otherwise it will continue calling this function // until all errors have been removed from the queue. int OpenSSLErrorCallback(const char* str, size_t len, void* context) { - DVLOG(1) << "\t" << StringPiece(str, len); + DVLOG(1) << "\t" << base::StringPiece(str, len); return 1; } -- cgit v1.1