Changes in src/Common/utility.h [843054c2:5f2f2d7]

File:

• src/Common/utility.h (modified) (6 diffs)

src/Common/utility.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 15:34:57 2015
-// Update Count     : 3
+// Last Modified On : Mon Jun  8 14:43:54 2015
+// Update Count     : 13
 //
 
@@ -18 +18 @@
 
 #include <iostream>
-#include <strstream>
+#include <sstream>
 #include <iterator>
 #include <string>
@@ -60 +60 @@
         for ( typename Container::const_iterator i = container.begin(); i != container.end(); ++i ) {
                 if ( *i ) {
-                        os << std::string(indent,  ' ');
+                        os << std::string( indent,  ' ' );
                         (*i)->print( os, indent + 2 );
                         os << std::endl;
@@ -130 +130 @@
 template < typename T > 
 std::string toString ( T value ) {
-        std::ostrstream os;
-  
+        std::ostringstream os;
         os << value; // << std::ends;
-        os.freeze( false );
-
-        return std::string(os.str(), os.pcount());
+        return os.str();
 }
 
@@ -151 +148 @@
 template< typename T >
 void replace( std::list< T > &org, typename std::list< T >::iterator pos, std::list< T > &with ) {
-        // TIter should secretly be a typename std::list< T >::iterator
-        //   ( g++ 3.2 issues a 'is implicitly a typename' warning if I make this explicit )
         typename std::list< T >::iterator next = pos; advance( next, 1 );
 
@@ -196 +191 @@
         while ( b1 != e1 && b2 != e2 )
                 *out++ = func(*b1++, *b2++);
+}
+
+// it's nice to actually be able to increment iterators by an arbitrary amount
+template< typename Iterator >
+Iterator operator+(Iterator i, int inc) {
+        while ( inc > 0 ) {
+                ++i;
+                --inc;
+        }
+        return i;
 }