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

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

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.