summaryrefslogtreecommitdiff
path: root/extra/yassl/include
diff options
context:
space:
mode:
authorunknown <svoj@mysql.com>2005-05-25 19:11:36 +0500
committerunknown <svoj@mysql.com>2005-05-25 19:11:36 +0500
commitf0f9b5959eecb87b369fc45c981d926b79de0c61 (patch)
tree174e95037d5db26c6fe56e6469e3b2b95e55d5f6 /extra/yassl/include
parentd9d47c6a6f8eb99735450a8f06d014e7efd705e9 (diff)
downloadmariadb-git-f0f9b5959eecb87b369fc45c981d926b79de0c61.tar.gz
WL#2286 - Compile MySQL w/YASSL support
Merge with latest yaSSL, fix compilation error for SSE2 processors. extra/yassl/include/yassl_int.hpp: Merge with latest yaSSL. extra/yassl/src/log.cpp: Merge with latest yaSSL. extra/yassl/src/yassl_int.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/integer.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/integer.cpp: Fix compilation error for SSE2 processors.
Diffstat (limited to 'extra/yassl/include')
-rw-r--r--extra/yassl/include/yassl_int.hpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/extra/yassl/include/yassl_int.hpp b/extra/yassl/include/yassl_int.hpp
index c9168254907..876f730a07d 100644
--- a/extra/yassl/include/yassl_int.hpp
+++ b/extra/yassl/include/yassl_int.hpp
@@ -122,7 +122,8 @@ public:
friend sslFactory& GetSSL_Factory(); // singleton creator
private:
- static sslFactory instance;
+ static sslFactory instance_;
+
sslFactory(const sslFactory&); // hide copy
sslFactory& operator=(const sslFactory&); // and assign
};
@@ -207,9 +208,10 @@ public:
friend Sessions& GetSessions(); // singleton creator
private:
+ static Sessions instance_;
+
Sessions(const Sessions&); // hide copy
Sessions& operator=(const Sessions&); // and assign
- static Sessions instance;
};