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

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

Revision: 1762
          http://complement.svn.sourceforge.net/complement/?rev=1762&view=rev
Author:   complement
Date:     2007-10-09 05:51:51 -0700 (Tue, 09 Oct 2007)

Log Message:
-----------
preserve and restore format flags during trace;

libstem: library version 4.6.5.

Modified Paths:
--------------
    trunk/complement/explore/include/stem/EventHandler.h
    trunk/complement/explore/lib/stem/ChangeLog
    trunk/complement/explore/lib/stem/Makefile.inc

Modified: trunk/complement/explore/include/stem/EventHandler.h
===================================================================
--- trunk/complement/explore/include/stem/EventHandler.h	2007-10-09 11:29:47 UTC (rev 1761)
+++ trunk/complement/explore/include/stem/EventHandler.h	2007-10-09 12:51:51 UTC (rev 1762)
@@ -472,15 +472,26 @@
   }
   stem::code_type code = event.code();
   __AnyPMFentry *entry;
+  int f = out.flags();
   while ( first != last ) {
     if ( table.get( code, *first, entry ) ) {
-      out << "\tMessage 0x" << std::hex << code << std::dec << " catcher "
+      out << "\tMessage " << std::hex << std::showbase << code << std::dec << " catcher "
           << entry->pmf_name << " (state " << *first << ")";
+#ifdef STLPORT
+      out.flags( f );
+#else
+      out.flags( static_cast<std::_Ios_Fmtflags>(f) );
+#endif
       return true;
     }
     ++first;
   }
-  out << "\tCatcher not found for message 0x" << std::hex << code << std::dec;
+  out << "\tCatcher not found for message " << std::hex << std::showbase << code;
+#ifdef STLPORT
+  out.flags( f );
+#else
+  out.flags( static_cast<std::_Ios_Fmtflags>(f) );
+#endif
   return false;
 }
 
@@ -492,10 +503,11 @@
   }
   __AnyPMFentry *entry;
   typename table_type::const_iterator1 i1 = table.begin();
+  int f = out.flags();
   while ( i1 != table.end() ) {
     stem::code_type key1 = table.key1st(*i1);
     typename table_type::const_iterator2 i2 = table.begin( i1 );
-    out << "\tMessage: " << std::hex << key1 << std::dec << std::endl;
+    out << "\tMessage: " << std::hex << std::showbase << key1 << std::dec << std::endl;
     while ( i2 != table.end( i1 ) ) {
       state_type key2 = table.key2nd(*i2++);
       table.get( key1, key2, entry );
@@ -503,6 +515,11 @@
     }
     ++i1;
   }
+#ifdef STLPORT
+  out.flags( f );
+#else
+  out.flags( static_cast<std::_Ios_Fmtflags>(f) );
+#endif
 }
 
 typedef std::list<state_type> HistoryContainer;

Modified: trunk/complement/explore/lib/stem/ChangeLog
===================================================================
--- trunk/complement/explore/lib/stem/ChangeLog	2007-10-09 11:29:47 UTC (rev 1761)
+++ trunk/complement/explore/lib/stem/ChangeLog	2007-10-09 12:51:51 UTC (rev 1762)
@@ -1,3 +1,10 @@
+2007-10-09  Petr Ovtchenkov  <pt...@is...>
+
+	* EventHandler.h: preserve and restore format flags during
+	trace;
+
+	* libstem: library version 4.6.5.
+
 2007-10-01  Petr Ovtchenkov  <pt...@is...>
 
 	* NetTransport.h, NetTransport.cc: comment NetTransportMP,

Modified: trunk/complement/explore/lib/stem/Makefile.inc
===================================================================
--- trunk/complement/explore/lib/stem/Makefile.inc	2007-10-09 11:29:47 UTC (rev 1761)
+++ trunk/complement/explore/lib/stem/Makefile.inc	2007-10-09 12:51:51 UTC (rev 1762)
@@ -3,7 +3,7 @@
 LIBNAME = stem
 MAJOR = 4
 MINOR = 6
-PATCH = 4
+PATCH = 5
 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.