chromium/src
0
Fork 0
Code Activity

Fix openssl build

Browse Source 
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
This commit is contained in:
joth@chromium.org
2011-04-15 13:09:26 +00:00
parent c3d00c8bd8
commit dba10cbee7
2 changed files with 5 additions and 5 deletions

6
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<OpenSSLInitSingleton,
base::LeakySingletonTraits<OpenSSLInitSingleton> >::get();
return Singleton<OpenSSLInitSingleton,
LeakySingletonTraits<OpenSSLInitSingleton> >::get();
}
private:
friend struct DefaultSingletonTraits<OpenSSLInitSingleton>;
@ -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;
}

4
net/socket/ssl_server_socket_openssl.cc

@ -1,4 +1,4 @@
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@ -51,7 +51,7 @@ class SSLServerSocketOpenSSL : public SSLServerSocket {
SSLServerSocket* CreateSSLServerSocket(Socket* socket,
X509Certificate* certificate,
base::RSAPrivateKey* key,
crypto::RSAPrivateKey* key,
const SSLConfig& ssl_config) {
return new SSLServerSocketOpenSSL();
}