Thread: [complement-svn] SF.net SVN: complement: [1690] trunk/complement/explore/include/janus/vtime .h
Status: Pre-Alpha
Brought to you by:
complement
Menu
▾
▴
complement-svn
|
From: <com...@us...> - 2007-08-17 12:43:37
|
Revision: 1690
http://complement.svn.sourceforge.net/complement/?rev=1690&view=rev
Author: complement
Date: 2007-08-17 05:43:35 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
typo
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:42:07 UTC (rev 1689)
+++ trunk/complement/explore/include/janus/vtime.h 2007-08-17 12:43:35 UTC (rev 1690)
@@ -24,12 +24,7 @@
# define __USE_STD_TR1
# endif
#endif
-
-#include <unordered_map>
-#include <unordered_set>
-
#include <iterator>
-
#include <istream>
#include <ostream>
#include <stdexcept>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-08-17 12:56:27
|
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.
|
|
From: <com...@us...> - 2007-08-17 15:31:13
|
Revision: 1694
http://complement.svn.sourceforge.net/complement/?rev=1694&view=rev
Author: complement
Date: 2007-08-17 08:24:30 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
hash in STD always in __gnu_cxx namespace
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 15:22:41 UTC (rev 1693)
+++ trunk/complement/explore/include/janus/vtime.h 2007-08-17 15:24:30 UTC (rev 1694)
@@ -41,10 +41,10 @@
} // namespace janus
-#if defined(__USE_STLPORT_HASH) || defined(__USE_STLPORT_TR1) || defined(__USE_STD_TR1)
+#if defined(__USE_STLPORT_HASH) || defined(__USE_STLPORT_TR1)
# define __HASH_NAMESPACE std
#endif
-#ifdef __USE_STD_HASH
+#if defined(__USE_STD_HASH) || defined(__USE_STD_TR1)
# define __HASH_NAMESPACE __gnu_cxx
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-08-17 16:13:14
|
Revision: 1695
http://complement.svn.sourceforge.net/complement/?rev=1695&view=rev
Author: complement
Date: 2007-08-17 09:13:09 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
dancing with std::tr1::hashtable from libstdc++ team
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 15:24:30 UTC (rev 1694)
+++ trunk/complement/explore/include/janus/vtime.h 2007-08-17 16:13:09 UTC (rev 1695)
@@ -41,15 +41,19 @@
} // namespace janus
-#if defined(__USE_STLPORT_HASH) || defined(__USE_STLPORT_TR1)
+#if defined(__USE_STLPORT_HASH) || defined(__USE_STLPORT_TR1) || defined(__USE_STD_TR1)
# define __HASH_NAMESPACE std
#endif
-#if defined(__USE_STD_HASH) || defined(__USE_STD_TR1)
+#if defined(__USE_STD_HASH)
# define __HASH_NAMESPACE __gnu_cxx
#endif
namespace __HASH_NAMESPACE {
+#ifdef __USE_STD_TR1
+namespace tr1 {
+#endif
+
template <>
struct hash<janus::oid_type>
{
@@ -57,6 +61,10 @@
{ return __x.addr; }
};
+#ifdef __USE_STD_TR1
+}
+#endif
+
} // namespace __HASH_NAMESPACE
#undef __HASH_NAMESPACE
@@ -132,9 +140,15 @@
vtime& operator +=( const vtime_type::value_type& );
- vtime_type::data_type& operator[]( const vtime_type::key_type& k )
+#ifdef __USE_STD_TR1
+ typedef vtime_type::value_type data_type;
+#else
+ typedef vtime_type::data_type data_type;
+#endif
+
+ data_type& operator[]( const vtime_type::key_type& k )
{ return vt[k]; }
- const vtime_type::data_type& operator[]( const vtime_type::key_type& k ) const
+ const data_type& operator[]( const vtime_type::key_type& k ) const
{ return vt[k]; }
@@ -181,9 +195,15 @@
gvtime& operator +=( const gvtime_type::value_type& );
gvtime& operator +=( const gvtime& );
- gvtime_type::data_type& operator[]( const gvtime_type::key_type k )
+#ifdef __USE_STD_TR1
+ typedef gvtime_type::value_type data_type;
+#else
+ typedef gvtime_type::data_type data_type;
+#endif
+
+ data_type& operator[]( const gvtime_type::key_type k )
{ return gvt[k]; }
- const gvtime_type::data_type& operator[]( const gvtime_type::key_type k ) const
+ const data_type& operator[]( const gvtime_type::key_type k ) const
{ return gvt[k]; }
mutable gvtime_type gvt;
@@ -282,7 +302,13 @@
void sync( group_type, const oid_type&, const gvtime_type& );
#ifdef __FIT_EXAM
- const gvtime_type::data_type& operator[]( const gvtime_type::key_type k ) const
+#ifdef __USE_STD_TR1
+ typedef gvtime_type::value_type data_type;
+#else
+ typedef gvtime_type::data_type data_type;
+#endif
+
+ const data_type& operator[]( const gvtime_type::key_type k ) const
{ return vt[k]; }
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-08-17 16:25:17
|
Revision: 1696
http://complement.svn.sourceforge.net/complement/?rev=1696&view=rev
Author: complement
Date: 2007-08-17 09:25:13 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
dancing with std::tr1::hashtable from libstdc++ team
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 16:13:09 UTC (rev 1695)
+++ trunk/complement/explore/include/janus/vtime.h 2007-08-17 16:25:13 UTC (rev 1696)
@@ -141,7 +141,7 @@
vtime& operator +=( const vtime_type::value_type& );
#ifdef __USE_STD_TR1
- typedef vtime_type::value_type data_type;
+ typedef vtime_unit_type data_type;
#else
typedef vtime_type::data_type data_type;
#endif
@@ -196,7 +196,7 @@
gvtime& operator +=( const gvtime& );
#ifdef __USE_STD_TR1
- typedef gvtime_type::value_type data_type;
+ typedef vtime data_type;
#else
typedef gvtime_type::data_type data_type;
#endif
@@ -303,7 +303,7 @@
#ifdef __FIT_EXAM
#ifdef __USE_STD_TR1
- typedef gvtime_type::value_type data_type;
+ typedef vtime data_type;
#else
typedef gvtime_type::data_type data_type;
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-08-17 18:07:00
|
Revision: 1697
http://complement.svn.sourceforge.net/complement/?rev=1697&view=rev
Author: complement
Date: 2007-08-17 11:06:59 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
mapped_type is correct for all, including proposed standard
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 16:25:13 UTC (rev 1696)
+++ trunk/complement/explore/include/janus/vtime.h 2007-08-17 18:06:59 UTC (rev 1697)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <07/08/17 10:38:35 ptr>
+// -*- C++ -*- Time-stamp: <07/08/17 21:54:39 ptr>
#ifndef __vtime_h
#define __vtime_h
@@ -140,15 +140,9 @@
vtime& operator +=( const vtime_type::value_type& );
-#ifdef __USE_STD_TR1
- typedef vtime_unit_type data_type;
-#else
- typedef vtime_type::data_type data_type;
-#endif
-
- data_type& operator[]( const vtime_type::key_type& k )
+ vtime_type::mapped_type& operator[]( const vtime_type::key_type& k )
{ return vt[k]; }
- const data_type& operator[]( const vtime_type::key_type& k ) const
+ const vtime_type::mapped_type& operator[]( const vtime_type::key_type& k ) const
{ return vt[k]; }
@@ -195,15 +189,9 @@
gvtime& operator +=( const gvtime_type::value_type& );
gvtime& operator +=( const gvtime& );
-#ifdef __USE_STD_TR1
- typedef vtime data_type;
-#else
- typedef gvtime_type::data_type data_type;
-#endif
-
- data_type& operator[]( const gvtime_type::key_type k )
+ gvtime_type::mapped_type& operator[]( const gvtime_type::key_type k )
{ return gvt[k]; }
- const data_type& operator[]( const gvtime_type::key_type k ) const
+ const gvtime_type::mapped_type& operator[]( const gvtime_type::key_type k ) const
{ return gvt[k]; }
mutable gvtime_type gvt;
@@ -302,13 +290,7 @@
void sync( group_type, const oid_type&, const gvtime_type& );
#ifdef __FIT_EXAM
-#ifdef __USE_STD_TR1
- typedef vtime data_type;
-#else
- typedef gvtime_type::data_type data_type;
-#endif
-
- const data_type& operator[]( const gvtime_type::key_type k ) const
+ const gvtime_type::mapped_type& operator[]( const gvtime_type::key_type k ) const
{ return vt[k]; }
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X