[complement-svn] SF.net SVN: complement: [1646] trunk/complement/explore

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

Revision: 1646
          http://complement.svn.sourceforge.net/complement/?rev=1646&view=rev
Author:   complement
Date:     2007-07-27 03:10:55 -0700 (Fri, 27 Jul 2007)

Log Message:
-----------
operator of format output of gaddr_type is public now and situated in the EvPack.cc,
declared in the Event.h in namespace std; libstem vertion bumped to 4.6.1

Modified Paths:
--------------
    trunk/complement/explore/include/stem/Event.h
    trunk/complement/explore/lib/stem/ChangeLog
    trunk/complement/explore/lib/stem/EvManager.cc
    trunk/complement/explore/lib/stem/EvPack.cc
    trunk/complement/explore/lib/stem/Makefile.inc

Modified: trunk/complement/explore/include/stem/Event.h
===================================================================
--- trunk/complement/explore/include/stem/Event.h	2007-07-27 04:04:28 UTC (rev 1645)
+++ trunk/complement/explore/include/stem/Event.h	2007-07-27 10:10:55 UTC (rev 1646)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <06/11/30 20:11:30 ptr>
+// -*- C++ -*- Time-stamp: <07/07/27 09:41:46 ptr>
 
 /*
  *
@@ -652,6 +652,12 @@
 
 } // namespace stem
 
+namespace std {
+
+ostream& operator <<( ostream& o, const stem::gaddr_type& g );
+
+} // namespace std
+
 namespace EDS = stem;
 
 #endif

Modified: trunk/complement/explore/lib/stem/ChangeLog
===================================================================
--- trunk/complement/explore/lib/stem/ChangeLog	2007-07-27 04:04:28 UTC (rev 1645)
+++ trunk/complement/explore/lib/stem/ChangeLog	2007-07-27 10:10:55 UTC (rev 1646)
@@ -1,3 +1,11 @@
+2007-07-27  Petr Ovtchenkov  <pt...@is...>
+
+	* Event.h, EvManager.cc, EvPack.cc: operator of format output
+	of gaddr_type is public now and situated in the EvPack.cc,
+	declared in the Event.h in namespace std.
+
+	* libstem: library version 4.6.1
+
 2007-07-18  Petr Ovtchenkov  <pt...@is...>
 
 	* test/stem: boost unit test framework replaced by exam.

Modified: trunk/complement/explore/lib/stem/EvManager.cc
===================================================================
--- trunk/complement/explore/lib/stem/EvManager.cc	2007-07-27 04:04:28 UTC (rev 1645)
+++ trunk/complement/explore/lib/stem/EvManager.cc	2007-07-27 10:10:55 UTC (rev 1646)
@@ -42,8 +42,6 @@
 
 std::string EvManager::inv_key_str( "invalid key" );
 
-std::ostream& operator <<( std::ostream& s, const gaddr_type& ga );
-
 __FIT_DECLSPEC EvManager::EvManager() :
     _low( beglocaddr ),
     _high( endlocaddr ),
@@ -653,6 +651,7 @@
 }
 
 
+#if 0
 std::ostream& operator <<( ostream& s, const gaddr_type& ga )
 {
   ios_base::fmtflags f = s.flags( 0 );
@@ -682,6 +681,7 @@
 
   return s;
 }
+#endif
 
 __FIT_DECLSPEC std::ostream& EvManager::dump( std::ostream& s ) const
 {

Modified: trunk/complement/explore/lib/stem/EvPack.cc
===================================================================
--- trunk/complement/explore/lib/stem/EvPack.cc	2007-07-27 04:04:28 UTC (rev 1645)
+++ trunk/complement/explore/lib/stem/EvPack.cc	2007-07-27 10:10:55 UTC (rev 1646)
@@ -15,10 +15,30 @@
 #include "stem/Event.h"
 #include <iterator>
 #include <iostream>
+#include <iomanip>
 #include <string>
 #include <algorithm>
 #include <stdint.h>
 
+namespace std {
+
+ostream& operator <<( ostream& o, const stem::gaddr_type& g )
+{
+  ios_base::fmtflags f = o.flags( 0 );
+
+  o << hex << setfill( '0' ) 
+    << setw(8) << g.hid.u.l[0]
+    << setw(8) << g.hid.u.l[1]
+    << '-' << dec << g.pid << '-'
+    << hex << setfill( '0' ) << setw(8) << g.addr;
+
+  o.flags( f );
+
+  return o;
+}
+
+} // namespace std
+
 namespace stem {
 
 using namespace std;

Modified: trunk/complement/explore/lib/stem/Makefile.inc
===================================================================
--- trunk/complement/explore/lib/stem/Makefile.inc	2007-07-27 04:04:28 UTC (rev 1645)
+++ trunk/complement/explore/lib/stem/Makefile.inc	2007-07-27 10:10:55 UTC (rev 1646)
@@ -3,7 +3,7 @@
 LIBNAME = stem
 MAJOR = 4
 MINOR = 6
-PATCH = 0
+PATCH = 1
 SRC_CC = _EventHandler.cc NetTransport.cc EvManager.cc EvPack.cc crc.cc \
          Names.cc Cron.cc
 


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