[complement-svn] SF.net SVN: complement: [1691] trunk/complement/explore/include/janus/vtime .h

[<com...@us...>]

Revision: 1691
          http://complement.svn.sourceforge.net/complement/?rev=1691&view=rev
Author:   complement
Date:     2007-08-17 05:56:26 -0700 (Fri, 17 Aug 2007)

Log Message:
-----------
use correct namespace for hash specialization; clean signaling defines

Modified Paths:
--------------
    trunk/complement/explore/include/janus/vtime.h

Modified: trunk/complement/explore/include/janus/vtime.h
===================================================================
--- trunk/complement/explore/include/janus/vtime.h	2007-08-17 12:43:35 UTC (rev 1690)
+++ trunk/complement/explore/include/janus/vtime.h	2007-08-17 12:56:26 UTC (rev 1691)
@@ -41,8 +41,15 @@
 
 } // namespace janus
 
-namespace std {
+#if defined(__USE_STLPORT_HASH) || defined(__USE_STLPORT_TR1) || defined(__USE_STD_TR1)
+#  define __HASH_NAMESPACE std
+#endif
+#ifdef __USE_STD_HASH
+#  define __HASH_NAMESPACE __gnu_cxx
+#endif
 
+namespace __HASH_NAMESPACE {
+
 template <>
 struct hash<janus::oid_type>
 {
@@ -50,8 +57,10 @@
       { return __x.addr; }
 };
 
-} // namespace std
+} // namespace __HASH_NAMESPACE
 
+#undef __HASH_NAMESPACE
+
 namespace janus {
 
 typedef uint32_t vtime_unit_type;
@@ -448,6 +457,19 @@
 #define VS_OUT_MEMBER 0x302
 #define VS_SYNC_TIME  0x303
 
+#ifdef __USE_STLPORT_HASH
+#  undef __USE_STLPORT_HASH
+#endif
+#ifdef __USE_STD_HASH
+#  undef __USE_STD_HASH
+#endif
+#ifdef __USE_STLPORT_TR1
+#  undef __USE_STLPORT_TR1
+#endif
+#ifdef __USE_STD_TR1
+#  undef __USE_STD_TR1
+#endif
+
 } // namespace janus
 
 namespace std {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.