loki-lib-cvs

[Loki-lib-cvs] SF.net SVN: loki-lib:[1137] trunk/src/SafeFormat.cpp

[<ric...@us...>]

Revision: 1137
          http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1137&view=rev
Author:   rich_sposato
Date:     2011-10-04 20:48:36 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
Fix for bug 2694073. Added calls to reserve so append won't resize as often.

Modified Paths:
--------------
    trunk/src/SafeFormat.cpp

Modified: trunk/src/SafeFormat.cpp
===================================================================
--- trunk/src/SafeFormat.cpp	2011-10-04 00:52:09 UTC (rev 1136)
+++ trunk/src/SafeFormat.cpp	2011-10-04 20:48:36 UTC (rev 1137)
@@ -43,6 +43,11 @@
 
     void write(std::string& s, const char* from, const char* to) {
         assert(from <= to);
+        const size_t addCount = to - from;
+        if ( s.capacity() <= s.size() + addCount )
+        {
+            s.reserve( 2 * s.size() + addCount );
+        }
         s.append(from, to);
     }
 
@@ -85,10 +90,14 @@
     }
 
     PrintfState<std::string&, char> SPrintf(std::string& s, const char* format) {
+        const size_t estimate = ::strlen( format ) + 128;
+        s.reserve( estimate );
         return PrintfState<std::string&, char>(s, format);
     }
 
     PrintfState<std::string&, char> SPrintf(std::string& s, const std::string& format) {
+        const size_t estimate = format.size() + 128;
+        s.reserve( estimate );
         return PrintfState<std::string&, char>(s, format.c_str());
     }
 

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

[Loki-lib-cvs] SF.net SVN: loki-lib:[1140] trunk/src/SafeFormat.cpp

[<ric...@us...>]

Revision: 1140
          http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1140&view=rev
Author:   rich_sposato
Date:     2011-10-07 07:04:46 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
Added lines to make type of stdout clear to compiler.

Modified Paths:
--------------
    trunk/src/SafeFormat.cpp

Modified: trunk/src/SafeFormat.cpp
===================================================================
--- trunk/src/SafeFormat.cpp	2011-10-04 23:46:30 UTC (rev 1139)
+++ trunk/src/SafeFormat.cpp	2011-10-07 07:04:46 UTC (rev 1140)
@@ -69,7 +69,8 @@
         ::std::string buffer;
         const PrintfState< ::std::string &, char > state1( buffer, format );
         ::std::fwrite( buffer.c_str(), 1, buffer.size(), stdout );
-        PrintfState< std::FILE *, char > printState2 = state1.ChangeDevice( stdout );
+        ::std::FILE * f = stdout;
+        PrintfState< std::FILE *, char > printState2( state1.ChangeDevice( f ) );
         return printState2;
     }
 
@@ -77,7 +78,8 @@
         ::std::string buffer;
         const PrintfState< ::std::string &, char > state1( buffer, format.c_str() );
         ::std::fwrite( buffer.c_str(), 1, buffer.size(), stdout );
-        PrintfState< std::FILE *, char > printState2 = state1.ChangeDevice( stdout );
+        ::std::FILE * f = stdout;
+        PrintfState< std::FILE *, char > printState2( state1.ChangeDevice( f ) );
         return printState2;
     }
 

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