fix possible race condition in Singleton::Ref()

tolerate double destruction of Singleton and g_nullNameValuePairs
fix #include of standard headers


git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@488 57ff6487-cd31-0410-9ec3-f628ee90f5f0

1 files changed, 1 insertions, 8 deletions

diff --git a/cryptlib.h b/cryptlib.h
index 15cd6da..b5faa58 100644
--- a/cryptlib.h
+++ b/cryptlib.h
@@ -318,14 +318,7 @@ DOCUMENTED_NAMESPACE_BEGIN(Name)
 DOCUMENTED_NAMESPACE_END
 
 //! empty set of name-value pairs
-class CRYPTOPP_DLL NullNameValuePairs : public NameValuePairs
-{
-public:
-	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const {return false;}
-};
-
-//! _
-extern CRYPTOPP_DLL const NullNameValuePairs g_nullNameValuePairs;
+extern CRYPTOPP_DLL const NameValuePairs &g_nullNameValuePairs;
 
 // ********************************************************