summaryrefslogtreecommitdiff
path: root/extra/yassl/taocrypt/include/misc.hpp
diff options
context:
space:
mode:
authorunknown <svoj@mysql.com>2005-06-16 16:35:09 +0500
committerunknown <svoj@mysql.com>2005-06-16 16:35:09 +0500
commit0dabdf15a7f8d75eddc11f53f8ef87de3783b72d (patch)
treec92c38ffa34a246fd7cbc247a2d6dc5f7628263e /extra/yassl/taocrypt/include/misc.hpp
parentfc465d1497ce598d07ec75eeaafc7ca84b578ee6 (diff)
downloadmariadb-git-0dabdf15a7f8d75eddc11f53f8ef87de3783b72d.tar.gz
WL#2286 - Compile MySQL w/YASSL support
Merge with latest yaSSL. extra/yassl/include/lock.hpp: Merge with latest yaSSL. extra/yassl/include/socket_wrapper.hpp: Merge with latest yaSSL. extra/yassl/mySTL/helpers.hpp: Merge with latest yaSSL. extra/yassl/src/lock.cpp: Merge with latest yaSSL. extra/yassl/src/log.cpp: Merge with latest yaSSL. extra/yassl/src/socket_wrapper.cpp: Merge with latest yaSSL. extra/yassl/src/ssl.cpp: Merge with latest yaSSL. extra/yassl/src/timer.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/misc.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/random.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/types.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/asn.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/integer.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/misc.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/random.cpp: Merge with latest yaSSL.
Diffstat (limited to 'extra/yassl/taocrypt/include/misc.hpp')
-rw-r--r--extra/yassl/taocrypt/include/misc.hpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/extra/yassl/taocrypt/include/misc.hpp b/extra/yassl/taocrypt/include/misc.hpp
index 812cdd93879..187d5cc6769 100644
--- a/extra/yassl/taocrypt/include/misc.hpp
+++ b/extra/yassl/taocrypt/include/misc.hpp
@@ -30,14 +30,9 @@
#include "types.hpp"
#include "type_traits.hpp"
-/*
-namespace GCC_ABI {
- extern "C" int __cxa_pure_virtual();
-} */
-namespace TaoCrypt {
-// using GCC_ABI::__cxa_pure_virtual;
+namespace TaoCrypt {
// library allocation
struct new_t {}; // TaoCrypt New type
@@ -75,7 +70,7 @@ void tcArrayDelete(T* ptr)
// to resolve compiler generated operator delete on base classes with
-// virtual destructors, make sure doesn't get called
+// virtual destructors (when on stack), make sure doesn't get called
class virtual_base {
public:
static void operator delete(void*) { assert(0); }
@@ -742,8 +737,6 @@ unsigned int BytePrecision(unsigned long value);
unsigned int BitPrecision(unsigned long);
unsigned long Crop(unsigned long value, unsigned int size);
-void CallNewHandler();
-
} // namespace