Index: src/ResolvExpr/AlternativeFinder.cc
===================================================================
--- src/ResolvExpr/AlternativeFinder.cc	(revision 30651b061fc903c716c0acd424112934cf8aaedb)
+++ src/ResolvExpr/AlternativeFinder.cc	(revision eff0cad0bfc8a388104f505544a5d34d261340f5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:52:08 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu May 21 16:21:09 2015
-// Update Count     : 12
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jun  8 14:53:58 2015
+// Update Count     : 14
 //
 
@@ -209,5 +209,5 @@
 		pruneAlternatives( alternatives.begin(), alternatives.end(), front_inserter( alternatives ), indexer );
 		if ( alternatives.begin() == oldBegin ) {
-			std::ostrstream stream;
+			std::ostringstream stream;
 			stream << "Can't choose between alternatives for expression ";
 			expr->print( stream );
@@ -216,5 +216,5 @@
 			findMinCost( alternatives.begin(), alternatives.end(), back_inserter( winners ) );
 			printAlts( winners, stream, 8 );
-			throw SemanticError( std::string( stream.str(), stream.pcount() ) );
+			throw SemanticError( stream.str() );
 		}
 		alternatives.erase( oldBegin, alternatives.end() );
Index: src/ResolvExpr/RenameVars.cc
===================================================================
--- src/ResolvExpr/RenameVars.cc	(revision 30651b061fc903c716c0acd424112934cf8aaedb)
+++ src/ResolvExpr/RenameVars.cc	(revision eff0cad0bfc8a388104f505544a5d34d261340f5)
@@ -10,9 +10,9 @@
 // Created On       : Sun May 17 12:05:18 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 12:07:59 2015
-// Update Count     : 2
+// Last Modified On : Mon Jun  8 14:51:35 2015
+// Update Count     : 4
 //
 
-#include <strstream>
+#include <sstream>
 
 #include "RenameVars.h"
@@ -120,7 +120,7 @@
 			mapStack.push_front( mapStack.front() );
 			for ( std::list< TypeDecl* >::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
-				std::ostrstream output;
+				std::ostringstream output;
 				output << "_" << level << "_" << (*i)->get_name();
-				std::string newname( output.str(), output.pcount() );
+				std::string newname( output.str() );
 				mapStack.front()[ (*i)->get_name() ] = newname;
 				(*i)->set_name( newname );
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision 30651b061fc903c716c0acd424112934cf8aaedb)
+++ src/ResolvExpr/Resolver.cc	(revision eff0cad0bfc8a388104f505544a5d34d261340f5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Jun 01 13:47:16 2015
-// Update Count     : 21
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun  7 21:50:37 2015
+// Update Count     : 23
 //