Port all cmOStringStream to std::ostringstream.

All compilers hosting CMake support the std class.

127 files changed, 613 insertions, 612 deletions

diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx
index 0644ecbd39..4a99e50378 100644
--- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx
+++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx
@@ -24,7 +24,7 @@
 #endif
 #define cmCPackLogger(logType, msg)                                     \
   do {                                                                  \
-  cmOStringStream cmCPackLog_msg;                                       \
+  std::ostringstream cmCPackLog_msg;                                    \
   cmCPackLog_msg << msg;                                                \
   if(Generator) {                                                       \
   Generator->Logger->Log(logType, __FILE__, __LINE__,                   \
diff --git a/Source/CPack/IFW/cmCPackIFWPackage.cxx b/Source/CPack/IFW/cmCPackIFWPackage.cxx
index 3c45639ef6..38cef87f77 100644
--- a/Source/CPack/IFW/cmCPackIFWPackage.cxx
+++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx
@@ -25,7 +25,7 @@
 #endif
 #define cmCPackLogger(logType, msg)                                     \
   do {                                                                  \
-  cmOStringStream cmCPackLog_msg;                                       \
+  std::ostringstream cmCPackLog_msg;                                    \
   cmCPackLog_msg << msg;                                                \
   if(Generator) {                                                       \
   Generator->Logger->Log(logType, __FILE__, __LINE__,                   \
diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx
index fbd1d216bd..e75156810c 100644
--- a/Source/CPack/cmCPackBundleGenerator.cxx
+++ b/Source/CPack/cmCPackBundleGenerator.cxx
@@ -112,24 +112,24 @@ int cmCPackBundleGenerator::ConstructBundle()
 
   // The staging directory contains everything that will end-up inside the
   // final disk image ...
-  cmOStringStream staging;
+  std::ostringstream staging;
   staging << toplevel;
 
-  cmOStringStream contents;
+  std::ostringstream contents;
   contents << staging.str() << "/" << cpack_bundle_name
     << ".app/" << "Contents";
 
-  cmOStringStream application;
+  std::ostringstream application;
   application << contents.str() << "/" << "MacOS";
 
-  cmOStringStream resources;
+  std::ostringstream resources;
   resources << contents.str() << "/" << "Resources";
 
   // Install a required, user-provided bundle metadata file ...
-  cmOStringStream plist_source;
+  std::ostringstream plist_source;
   plist_source << cpack_bundle_plist;
 
-  cmOStringStream plist_target;
+  std::ostringstream plist_target;
   plist_target << contents.str() << "/" << "Info.plist";
 
   if(!this->CopyFile(plist_source, plist_target))
@@ -142,10 +142,10 @@ int cmCPackBundleGenerator::ConstructBundle()
     }
 
   // Install a user-provided bundle icon ...
-  cmOStringStream icon_source;
+  std::ostringstream icon_source;
   icon_source << cpack_bundle_icon;
 
-  cmOStringStream icon_target;
+  std::ostringstream icon_target;
   icon_target << resources.str() << "/" << cpack_bundle_name << ".icns";
 
   if(!this->CopyFile(icon_source, icon_target))
@@ -161,10 +161,10 @@ int cmCPackBundleGenerator::ConstructBundle()
   // executable or a script) ...
   if(!cpack_bundle_startup_command.empty())
     {
-    cmOStringStream command_source;
+    std::ostringstream command_source;
     command_source << cpack_bundle_startup_command;
 
-    cmOStringStream command_target;
+    std::ostringstream command_target;
     command_target << application.str() << "/" << cpack_bundle_name;
 
     if(!this->CopyFile(command_source, command_target))
@@ -231,7 +231,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
     for(std::vector<std::string>::iterator it = relFiles.begin();
       it != relFiles.end(); ++it)
       {
-      cmOStringStream temp_sign_file_cmd;
+      std::ostringstream temp_sign_file_cmd;
       temp_sign_file_cmd << this->GetOption("CPACK_COMMAND_CODESIGN");
       temp_sign_file_cmd << " --deep -f -s \"" << cpack_apple_cert_app;
       temp_sign_file_cmd << "\" -i ";
@@ -251,7 +251,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
       }
 
     // sign main binary
-    cmOStringStream temp_sign_binary_cmd;
+    std::ostringstream temp_sign_binary_cmd;
     temp_sign_binary_cmd << this->GetOption("CPACK_COMMAND_CODESIGN");
     temp_sign_binary_cmd << " --deep -f -s \"" << cpack_apple_cert_app;
     temp_sign_binary_cmd << "\" \"" << bundle_path << "\"";
@@ -266,7 +266,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
       }
 
     // sign app bundle
-    cmOStringStream temp_codesign_cmd;
+    std::ostringstream temp_codesign_cmd;
     temp_codesign_cmd << this->GetOption("CPACK_COMMAND_CODESIGN");
     temp_codesign_cmd << " --deep -f -s \"" << cpack_apple_cert_app << "\"";
     if(this->GetOption("CPACK_BUNDLE_APPLE_ENTITLEMENTS"))
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 9f0a77eeff..5da9234236 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -169,8 +169,8 @@ int cmCPackDragNDropGenerator::PackageFiles()
 }
 
 //----------------------------------------------------------------------
-bool cmCPackDragNDropGenerator::CopyFile(cmOStringStream& source,
-  cmOStringStream& target)
+bool cmCPackDragNDropGenerator::CopyFile(std::ostringstream& source,
+  std::ostringstream& target)
 {
   if(!cmSystemTools::CopyFileIfDifferent(
     source.str().c_str(),
@@ -190,7 +190,7 @@ bool cmCPackDragNDropGenerator::CopyFile(cmOStringStream& source,
 }
 
 //----------------------------------------------------------------------
-bool cmCPackDragNDropGenerator::RunCommand(cmOStringStream& command,
+bool cmCPackDragNDropGenerator::RunCommand(std::ostringstream& command,
   std::string* output)
 {
   int exit_code = 1;
@@ -255,12 +255,12 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
 
   // The staging directory contains everything that will end-up inside the
   // final disk image ...
-  cmOStringStream staging;
+  std::ostringstream staging;
   staging << src_dir;
 
   // Add a symlink to /Applications so users can drag-and-drop the bundle
   // into it
-  cmOStringStream application_link;
+  std::ostringstream application_link;
   application_link << staging.str() << "/Applications";
   cmSystemTools::CreateSymlink("/Applications",
     application_link.str().c_str());
@@ -268,10 +268,10 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
   // Optionally add a custom volume icon ...
   if(!cpack_package_icon.empty())
     {
-    cmOStringStream package_icon_source;
+    std::ostringstream package_icon_source;
     package_icon_source << cpack_package_icon;
 
-    cmOStringStream package_icon_destination;
+    std::ostringstream package_icon_destination;
     package_icon_destination << staging.str() << "/.VolumeIcon.icns";
 
     if(!this->CopyFile(package_icon_source, package_icon_destination))
@@ -289,10 +289,10 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
   // (e.g. for setting background/layout) ...
   if(!cpack_dmg_ds_store.empty())
     {
-    cmOStringStream package_settings_source;
+    std::ostringstream package_settings_source;
     package_settings_source << cpack_dmg_ds_store;
 
-    cmOStringStream package_settings_destination;
+    std::ostringstream package_settings_destination;
     package_settings_destination << staging.str() << "/.DS_Store";
 
     if(!this->CopyFile(package_settings_source, package_settings_destination))
@@ -309,10 +309,10 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
   // Optionally add a custom background image ...
   if(!cpack_dmg_background_image.empty())
     {
-    cmOStringStream package_background_source;
+    std::ostringstream package_background_source;
     package_background_source << cpack_dmg_background_image;
 
-    cmOStringStream package_background_destination;
+    std::ostringstream package_background_destination;
     package_background_destination << staging.str() << "/background.png";
 
     if(!this->CopyFile(package_background_source,
@@ -326,7 +326,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
       return 0;
       }
 
-    cmOStringStream temp_background_hiding_command;
+    std::ostringstream temp_background_hiding_command;
     temp_background_hiding_command << this->GetOption("CPACK_COMMAND_SETFILE");
     temp_background_hiding_command << " -a V \"";
     temp_background_hiding_command << package_background_destination.str();
@@ -346,7 +346,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
   std::string temp_image = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
   temp_image += "/temp.dmg";
 
-  cmOStringStream temp_image_command;
+  std::ostringstream temp_image_command;
   temp_image_command << this->GetOption("CPACK_COMMAND_HDIUTIL");
   temp_image_command << " create";
   temp_image_command << " -ov";
@@ -368,9 +368,9 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
   // Optionally set the custom icon flag for the image ...
   if(!cpack_package_icon.empty())
     {
-    cmOStringStream temp_mount;
+    std::ostringstream temp_mount;
 
-    cmOStringStream attach_command;
+    std::ostringstream attach_command;
     attach_command << this->GetOption("CPACK_COMMAND_HDIUTIL");
     attach_command << " attach";
     attach_command << " \"" << temp_image << "\"";
@@ -389,7 +389,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
     mountpoint_regex.find(attach_output.c_str());
     temp_mount << mountpoint_regex.match(1);
 
-    cmOStringStream setfile_command;
+    std::ostringstream setfile_command;
     setfile_command << this->GetOption("CPACK_COMMAND_SETFILE");
     setfile_command << " -a C";
     setfile_command << " \"" << temp_mount.str() << "\"";
@@ -403,7 +403,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
       return 0;
       }
 
-    cmOStringStream detach_command;
+    std::ostringstream detach_command;
     detach_command << this->GetOption("CPACK_COMMAND_HDIUTIL");
     detach_command << " detach";
     detach_command << " \"" << temp_mount.str() << "\"";
@@ -471,7 +471,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
     std::string temp_udco = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
     temp_udco += "/temp-udco.dmg";
 
-    cmOStringStream udco_image_command;
+    std::ostringstream udco_image_command;
     udco_image_command << this->GetOption("CPACK_COMMAND_HDIUTIL");
     udco_image_command << " convert \"" << temp_image << "\"";
     udco_image_command << " -format UDCO";
@@ -488,7 +488,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
       }
 
     // unflatten dmg
-    cmOStringStream unflatten_command;
+    std::ostringstream unflatten_command;
     unflatten_command << this->GetOption("CPACK_COMMAND_HDIUTIL");
     unflatten_command << " unflatten ";
     unflatten_command << "\"" << temp_udco << "\"";
@@ -503,7 +503,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
       }
 
     // Rez the SLA
-    cmOStringStream embed_sla_command;
+    std::ostringstream embed_sla_command;
     embed_sla_command << this->GetOption("CPACK_COMMAND_REZ");
     const char* sysroot = this->GetOption("CPACK_OSX_SYSROOT");
     if(sysroot && sysroot[0] != '\0')
@@ -524,7 +524,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
       }
 
     // flatten dmg
-    cmOStringStream flatten_command;
+    std::ostringstream flatten_command;
     flatten_command << this->GetOption("CPACK_COMMAND_HDIUTIL");
     flatten_command << " flatten ";
     flatten_command << "\"" << temp_udco << "\"";
@@ -543,7 +543,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
 
 
   // Create the final compressed read-only disk image ...
-  cmOStringStream final_image_command;
+  std::ostringstream final_image_command;
   final_image_command << this->GetOption("CPACK_COMMAND_HDIUTIL");
   final_image_command << " convert \"" << temp_image << "\"";
   final_image_command << " -format ";
diff --git a/Source/CPack/cmCPackDragNDropGenerator.h b/Source/CPack/cmCPackDragNDropGenerator.h
index 808c618868..1c84d492d8 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.h
+++ b/Source/CPack/cmCPackDragNDropGenerator.h
@@ -33,8 +33,8 @@ protected:
   bool SupportsComponentInstallation() const;
 
 
-  bool CopyFile(cmOStringStream& source, cmOStringStream& target);
-  bool RunCommand(cmOStringStream& command, std::string* output = 0);
+  bool CopyFile(std::ostringstream& source, std::ostringstream& target);
+  bool RunCommand(std::ostringstream& command, std::string* output = 0);
 
   std::string
   GetComponentInstallDirNameSuffix(const std::string& componentName);
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 23302785e2..9cd53ead52 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -160,7 +160,7 @@ int cmCPackGenerator::PrepareNames()
         "Cannot open description file name: " << descFileName << std::endl);
       return 0;
       }
-    cmOStringStream ostr;
+    std::ostringstream ostr;
     std::string line;
 
     cmCPackLogger(cmCPackLog::LOG_VERBOSE,
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h
index ed89b53a84..907bb1ee15 100644
--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@@ -29,7 +29,7 @@
 
 #define cmCPackLogger(logType, msg) \
   do { \
-    cmOStringStream cmCPackLog_msg; \
+    std::ostringstream cmCPackLog_msg; \
     cmCPackLog_msg << msg; \
     this->Logger->Log(logType, __FILE__, __LINE__,\
                       cmCPackLog_msg.str().c_str());\
diff --git a/Source/CPack/cmCPackLog.h b/Source/CPack/cmCPackLog.h
index 812f1de27b..7a7ff589ac 100644
--- a/Source/CPack/cmCPackLog.h
+++ b/Source/CPack/cmCPackLog.h
@@ -17,7 +17,7 @@
 
 #define cmCPack_Log(ctSelf, logType, msg) \
   do { \
-  cmOStringStream cmCPackLog_msg; \
+  std::ostringstream cmCPackLog_msg; \
   cmCPackLog_msg << msg; \
   (ctSelf)->Log(logType, __FILE__, __LINE__, cmCPackLog_msg.str().c_str());\
   } while ( 0 )
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index b506b0689a..8f63ca20be 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -71,7 +71,7 @@ int cmCPackNSISGenerator::PackageFiles()
   tmpFile += "/NSISOutput.log";
   std::string nsisInstallOptions = nsisFileName + "/NSIS.InstallOptions.ini";
   nsisFileName += "/project.nsi";
-  cmOStringStream str;
+  std::ostringstream str;
   std::vector<std::string>::const_iterator it;
   for ( it = files.begin(); it != files.end(); ++ it )
     {
@@ -91,7 +91,7 @@ int cmCPackNSISGenerator::PackageFiles()
   std::vector<std::string> dirs;
   this->GetListOfSubdirectories(toplevel.c_str(), dirs);
   std::vector<std::string>::const_iterator sit;
-  cmOStringStream dstr;
+  std::ostringstream dstr;
   for ( sit = dirs.begin(); sit != dirs.end(); ++ sit )
     {
     std::string componentName;
@@ -190,7 +190,7 @@ int cmCPackNSISGenerator::PackageFiles()
     std::string groupDescriptions;
     std::string installTypesCode;
     std::string defines;
-    cmOStringStream macrosOut;
+    std::ostringstream macrosOut;
     bool anyDownloadedComponents = false;
 
     // Create installation types. The order is significant, so we first fill
@@ -503,8 +503,8 @@ int cmCPackNSISGenerator::InitializeInternal()
                   << "not set" << std::endl);
     }
 
-  cmOStringStream str;
-  cmOStringStream deleteStr;
+  std::ostringstream str;
+  std::ostringstream deleteStr;
 
   if ( cpackPackageExecutables )
     {
@@ -565,8 +565,8 @@ int cmCPackNSISGenerator::InitializeInternal()
 }
 
 //----------------------------------------------------------------------
-void cmCPackNSISGenerator::CreateMenuLinks( cmOStringStream& str,
-                                            cmOStringStream& deleteStr)
+void cmCPackNSISGenerator::CreateMenuLinks( std::ostringstream& str,
+                                            std::ostringstream& deleteStr)
 {
   const char* cpackMenuLinks
     = this->GetOption("CPACK_NSIS_MENU_LINKS");
@@ -694,7 +694,7 @@ bool cmCPackNSISGenerator::SupportsComponentInstallation() const
 std::string
 cmCPackNSISGenerator::
 CreateComponentDescription(cmCPackComponent *component,
-                           cmOStringStream& macrosOut)
+                           std::ostringstream& macrosOut)
 {
   // Basic description of the component
   std::string componentCode = "Section ";
@@ -714,7 +714,7 @@ CreateComponentDescription(cmCPackComponent *component,
     }
   else if (!component->InstallationTypes.empty())
     {
-    cmOStringStream out;
+    std::ostringstream out;
     std::vector<cmCPackInstallationType *>::iterator installTypeIter;
     for (installTypeIter = component->InstallationTypes.begin();
          installTypeIter != component->InstallationTypes.end();
@@ -734,7 +734,7 @@ CreateComponentDescription(cmCPackComponent *component,
       // Compute the name of the archive.
       std::string packagesDir = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
       packagesDir += ".dummy";
-      cmOStringStream out;
+      std::ostringstream out;
       out << cmSystemTools::GetFilenameWithoutLastExtension(packagesDir)
         << "-" << component->Name << ".zip";
       component->ArchiveFile = out.str();
@@ -859,7 +859,7 @@ CreateComponentDescription(cmCPackComponent *component,
       {
       totalSizeInKbytes = 1;
       }
-    cmOStringStream out;
+    std::ostringstream out;
     out << "  AddSize " << totalSizeInKbytes << "\n"
         << "  Push \"" << component->ArchiveFile << "\"\n"
         << "  Call DownloadFile\n"
@@ -935,7 +935,7 @@ std::string cmCPackNSISGenerator::CreateSelectionDependenciesDescription
     }
   visited.insert(component);
 
-  cmOStringStream out;
+  std::ostringstream out;
   std::vector<cmCPackComponent *>::iterator dependIt;
   for (dependIt = component->Dependencies.begin();
        dependIt != component->Dependencies.end();
@@ -967,7 +967,7 @@ std::string cmCPackNSISGenerator::CreateDeselectionDependenciesDescription
     }
   visited.insert(component);
 
-  cmOStringStream out;
+  std::ostringstream out;
   std::vector<cmCPackComponent *>::iterator dependIt;
   for (dependIt = component->ReverseDependencies.begin();
        dependIt != component->ReverseDependencies.end();
@@ -992,7 +992,7 @@ std::string cmCPackNSISGenerator::CreateDeselectionDependenciesDescription
 std::string
 cmCPackNSISGenerator::
 CreateComponentGroupDescription(cmCPackComponentGroup *group,
-                                cmOStringStream& macrosOut)
+                                std::ostringstream& macrosOut)
 {
   if (group->Components.empty() && group->Subgroups.empty())
     {
diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h
index e46fbdab7b..c7b2ce1084 100644
--- a/Source/CPack/cmCPackNSISGenerator.h
+++ b/Source/CPack/cmCPackNSISGenerator.h
@@ -38,8 +38,8 @@ public:
 
 protected:
   virtual int InitializeInternal();
-  void CreateMenuLinks( cmOStringStream& str,
-                        cmOStringStream& deleteStr);
+  void CreateMenuLinks( std::ostringstream& str,
+                        std::ostringstream& deleteStr);
   int PackageFiles();
   virtual const char* GetOutputExtension() { return ".exe"; }
   virtual const char* GetOutputPostfix() { return "win32"; }
@@ -56,7 +56,7 @@ protected:
   /// macrosOut.
   std::string
   CreateComponentDescription(cmCPackComponent *component,
-                             cmOStringStream& macrosOut);
+                             std::ostringstream& macrosOut);
 
   /// Produce NSIS code that selects all of the components that this component
   /// depends on, recursively.
@@ -75,7 +75,7 @@ protected:
   /// added macros will be emitted via macrosOut.
   std::string
   CreateComponentGroupDescription(cmCPackComponentGroup *group,
-                                  cmOStringStream& macrosOut);
+                                  std::ostringstream& macrosOut);
 
   /// Translations any newlines found in the string into \\r\\n, so that the
   /// resulting string can be used within NSIS.
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx
index 28c7f1dc07..313e08b30a 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -45,8 +45,8 @@ int cmCPackOSXX11Generator::PackageFiles()
     {
     cmCPackLogger(cmCPackLog::LOG_DEBUG, "The cpackPackageExecutables: "
       << cpackPackageExecutables << "." << std::endl);
-    cmOStringStream str;
-    cmOStringStream deleteStr;
+    std::ostringstream str;
+    std::ostringstream deleteStr;
     std::vector<std::string> cpackPackageExecutablesVector;
     cmSystemTools::ExpandListArgument(cpackPackageExecutables,
       cpackPackageExecutablesVector);
@@ -165,7 +165,7 @@ int cmCPackOSXX11Generator::PackageFiles()
   std::string output;
   std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
   tmpFile += "/hdiutilOutput.log";
-  cmOStringStream dmgCmd;
+  std::ostringstream dmgCmd;
   dmgCmd << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM_DISK_IMAGE")
          << "\" create -ov -format UDZO -srcfolder \""
          << diskImageDirectory.c_str()
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index e799d0615f..8a22131e40 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -325,7 +325,7 @@ int cmCPackPackageMakerGenerator::PackageFiles()
   if (this->Components.empty())
     {
     // Use PackageMaker to build the package.
-    cmOStringStream pkgCmd;
+    std::ostringstream pkgCmd;
     pkgCmd << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM")
            << "\" -build -p \"" << packageDirFileName << "\"";
     if (this->Components.empty())
@@ -359,7 +359,7 @@ int cmCPackPackageMakerGenerator::PackageFiles()
 
   std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
   tmpFile += "/hdiutilOutput.log";
-  cmOStringStream dmgCmd;
+  std::ostringstream dmgCmd;
   dmgCmd << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM_DISK_IMAGE")
     << "\" create -ov -format UDZO -srcfolder \"" << packageDirFileName
     << "\" \"" << packageFileNames[0] << "\"";
@@ -687,7 +687,7 @@ cmCPackPackageMakerGenerator::GetPackageName(const cmCPackComponent& component)
     {
     std::string packagesDir = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
     packagesDir += ".dummy";
-    cmOStringStream out;
+    std::ostringstream out;
     out << cmSystemTools::GetFilenameWithoutLastExtension(packagesDir)
         << "-" << component.Name << ".pkg";
     return out.str();
@@ -710,7 +710,7 @@ GenerateComponentPackage(const char *packageFile,
                 packageFile << std::endl);
 
   // The command that will be used to run PackageMaker
-  cmOStringStream pkgCmd;
+  std::ostringstream pkgCmd;
 
   if (this->PackageCompatibilityVersion < 10.5 ||
       this->PackageMakerVersion < 3.0)
@@ -800,7 +800,7 @@ WriteDistributionFile(const char* metapackageFile)
 
   // Create the choice outline, which provides a tree-based view of
   // the components in their groups.
-  cmOStringStream choiceOut;
+  std::ostringstream choiceOut;
   choiceOut << "<choices-outline>" << std::endl;
 
   // Emit the outline for the groups
@@ -862,7 +862,8 @@ WriteDistributionFile(const char* metapackageFile)
 //----------------------------------------------------------------------
 void
 cmCPackPackageMakerGenerator::
-CreateChoiceOutline(const cmCPackComponentGroup& group, cmOStringStream& out)
+CreateChoiceOutline(const cmCPackComponentGroup& group,
+                    std::ostringstream& out)
 {
   out << "<line choice=\"" << group.Name << "Choice\">" << std::endl;
   std::vector<cmCPackComponentGroup*>::const_iterator groupIt;
@@ -885,7 +886,7 @@ CreateChoiceOutline(const cmCPackComponentGroup& group, cmOStringStream& out)
 //----------------------------------------------------------------------
 void
 cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponentGroup& group,
-                                           cmOStringStream& out)
+                                           std::ostringstream& out)
 {
   out << "<choice id=\"" << group.Name << "Choice\" "
       << "title=\"" << group.DisplayName << "\" "
@@ -903,7 +904,7 @@ cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponentGroup& group,
 //----------------------------------------------------------------------
 void
 cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponent& component,
-                                           cmOStringStream& out)
+                                           std::ostringstream& out)
 {
   std::string packageId = "com.";
   packageId += this->GetOption("CPACK_PACKAGE_VENDOR");
@@ -989,7 +990,7 @@ void
 cmCPackPackageMakerGenerator::
 AddDependencyAttributes(const cmCPackComponent& component,
                         std::set<const cmCPackComponent *>& visited,
-                        cmOStringStream& out)
+                        std::ostringstream& out)
 {
   if (visited.find(&component) != visited.end())
     {
@@ -1013,7 +1014,7 @@ void
 cmCPackPackageMakerGenerator::
 AddReverseDependencyAttributes(const cmCPackComponent& component,
                                std::set<const cmCPackComponent *>& visited,
-                               cmOStringStream& out)
+                               std::ostringstream& out)
 {
   if (visited.find(&component) != visited.end())
     {
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.h b/Source/CPack/cmCPackPackageMakerGenerator.h
index e350a609df..1b468d73d6 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.h
+++ b/Source/CPack/cmCPackPackageMakerGenerator.h
@@ -84,30 +84,30 @@ protected:
   // dependency attributes for inter-component dependencies.
   void AddDependencyAttributes(const cmCPackComponent& component,
                                std::set<const cmCPackComponent *>& visited,
-                               cmOStringStream& out);
+                               std::ostringstream& out);
 
   // Subroutine of WriteDistributionFile that writes out the
   // reverse dependency attributes for inter-component dependencies.
   void
   AddReverseDependencyAttributes(const cmCPackComponent& component,
                                  std::set<const cmCPackComponent *>& visited,
-                                 cmOStringStream& out);
+                                 std::ostringstream& out);
 
   // Generates XML that encodes the hierarchy of component groups and
   // their components in a form that can be used by distribution
   // metapackages.
   void CreateChoiceOutline(const cmCPackComponentGroup& group,
-                           cmOStringStream& out);
+                           std::ostringstream& out);
 
   /// Create the "choice" XML element to describe a component group
   /// for the installer GUI.
   void CreateChoice(const cmCPackComponentGroup& group,
-                    cmOStringStream& out);
+                    std::ostringstream& out);
 
   /// Create the "choice" XML element to describe a component for the
   /// installer GUI.
   void CreateChoice(const cmCPackComponent& component,
-                    cmOStringStream& out);
+                    std::ostringstream& out);
 
   // Escape the given string to make it usable as an XML attribute
   // value.
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 26bf607446..b1b122d342 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -426,7 +426,7 @@ int main (int argc, char const* const* argv)
                 = mf->GetDefinition("CPACK_PACKAGE_VERSION_MINOR");
               const char* projVersionPatch
                 = mf->GetDefinition("CPACK_PACKAGE_VERSION_PATCH");
-              cmOStringStream ostr;
+              std::ostringstream ostr;
               ostr << projVersionMajor << "." << projVersionMinor << "."
                 << projVersionPatch;
               mf->AddDefinition("CPACK_PACKAGE_VERSION",
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx
index a101e39cf6..b1fb02dd16 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@@ -55,7 +55,7 @@ int cmCTestBuildAndTestHandler::ProcessHandler()
 
 //----------------------------------------------------------------------
 int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring,
-  cmOStringStream &out, std::string &cmakeOutString, std::string &cwd,
+  std::ostringstream &out, std::string &cmakeOutString, std::string &cwd,
   cmake *cm)
 {
   unsigned int k;
@@ -209,7 +209,7 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring)
   std::string cmakeOutString;
   cmCTestBuildAndTestCaptureRAII captureRAII(cm, cmakeOutString);
   static_cast<void>(captureRAII);
-  cmOStringStream out;
+  std::ostringstream out;
 
   if ( this->CTest->GetConfigType().size() == 0 &&
        this->ConfigSample.size())
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.h b/Source/CTest/cmCTestBuildAndTestHandler.h
index 5a7b9168fa..a75c631a2d 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.h
+++ b/Source/CTest/cmCTestBuildAndTestHandler.h
@@ -50,7 +50,7 @@ public:
 protected:
   ///! Run CMake and build a test and then run it as a single test.
   int RunCMakeAndTest(std::string* output);
-  int RunCMake(std::string* outstring, cmOStringStream &out,
+  int RunCMake(std::string* outstring, std::ostringstream &out,
                std::string &cmakeOutString,
                std::string &cwd, cmake *cm);
 
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx
index a5a593a081..c4df741506 100644
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@@ -148,7 +148,7 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
       }
     else
       {
-      cmOStringStream ostr;
+      std::ostringstream ostr;
       ostr << "has no project to build. If this is a "
         "\"built with CMake\" project, verify that CTEST_CMAKE_GENERATOR "
         "and CTEST_PROJECT_NAME are set."
@@ -181,7 +181,7 @@ bool cmCTestBuildCommand::InitialPass(std::vector<std::string> const& args,
   bool ret =  cmCTestHandlerCommand::InitialPass(args, status);
   if ( this->Values[ctb_NUMBER_ERRORS] && *this->Values[ctb_NUMBER_ERRORS])
     {
-    cmOStringStream str;
+    std::ostringstream str;
     str << this->Handler->GetTotalErrors();
     this->Makefile->AddDefinition(
       this->Values[ctb_NUMBER_ERRORS], str.str().c_str());
@@ -189,7 +189,7 @@ bool cmCTestBuildCommand::InitialPass(std::vector<std::string> const& args,
   if ( this->Values[ctb_NUMBER_WARNINGS]
        && *this->Values[ctb_NUMBER_WARNINGS])
     {
-    cmOStringStream str;
+    std::ostringstream str;
     str << this->Handler->GetTotalWarnings();
     this->Makefile->AddDefinition(
       this->Values[ctb_NUMBER_WARNINGS], str.str().c_str());
diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx
index ef62fd3728..0f13263979 100644
--- a/Source/CTest/cmCTestConfigureCommand.cxx
+++ b/Source/CTest/cmCTestConfigureCommand.cxx
@@ -66,7 +66,7 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler()
       const std::string cmakelists_file = source_dir + "/CMakeLists.txt";
       if ( !cmSystemTools::FileExists(cmakelists_file.c_str()) )
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "CMakeLists.txt file does not exist ["
           << cmakelists_file << "]";
         this->SetError(e.str());
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index a1d770bd5e..25bd96f246 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -544,7 +544,7 @@ int cmCTestCoverageHandler::ProcessHandler()
     cmsys::ifstream ifs(fullFileName.c_str());
     if ( !ifs)
       {
-      cmOStringStream ostr;
+      std::ostringstream ostr;
       ostr <<  "Cannot open source file: " << fullFileName;
       errorsWhileAccumulating.push_back(ostr.str());
       error ++;
@@ -563,7 +563,7 @@ int cmCTestCoverageHandler::ProcessHandler()
       if ( !cmSystemTools::GetLineFromStream(ifs, line) &&
         cc != fcov.size() -1 )
         {
-        cmOStringStream ostr;
+        std::ostringstream ostr;
         ostr << "Problem reading source file: " << fullFileName
              << " line:" << cc << "  out total: " << fcov.size()-1;
         errorsWhileAccumulating.push_back(ostr.str());
@@ -584,7 +584,7 @@ int cmCTestCoverageHandler::ProcessHandler()
       }
     if ( cmSystemTools::GetLineFromStream(ifs, line) )
       {
-      cmOStringStream ostr;
+      std::ostringstream ostr;
       ostr <<  "Looks like there are more lines in the file: " << fullFileName;
       errorsWhileAccumulating.push_back(ostr.str());
       }
@@ -633,7 +633,7 @@ int cmCTestCoverageHandler::ProcessHandler()
     cmsys::ifstream ifs(fullPath.c_str());
     if (!ifs)
       {
-      cmOStringStream ostr;
+      std::ostringstream ostr;
       ostr <<  "Cannot open source file: " << fullPath;
       errorsWhileAccumulating.push_back(ostr.str());
       error ++;
diff --git a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx
index 5ddef01a75..e175592e60 100644
--- a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx
+++ b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx
@@ -24,7 +24,7 @@ bool cmCTestEmptyBinaryDirectoryCommand
 
   if ( !cmCTestScriptHandler::EmptyBinaryDirectory(args[0].c_str()) )
     {
-    cmOStringStream ostr;
+    std::ostringstream ostr;
     ostr << "problem removing the binary directory: " << args[0];
     this->SetError(ostr.str());
     return false;
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index 2df2229e73..13c8ca5f12 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -103,7 +103,7 @@ bool cmCTestGenericHandler::StartResultingXML(cmCTest::Part part,
       << std::endl;);
     return false;
     }
-  cmOStringStream ostr;
+  std::ostringstream ostr;
   ostr << name;
   if ( this->SubmitIndex > 0 )
     {
@@ -142,7 +142,7 @@ bool cmCTestGenericHandler::StartLogFile(const char* name,
       "Cannot create log file without providing the name" << std::endl;);
     return false;
     }
-  cmOStringStream ostr;
+  std::ostringstream ostr;
   ostr << "Last" << name;
   if ( this->SubmitIndex > 0 )
     {
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 5b525dd598..b886777a99 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -46,7 +46,7 @@ bool cmCTestHandlerCommand
     if(!this->CheckArgumentKeyword(args[i]) &&
        !this->CheckArgumentValue(args[i]))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "called with unknown argument \"" << args[i] << "\".";
       this->SetError(e.str());
       return false;
@@ -141,7 +141,7 @@ bool cmCTestHandlerCommand
   int res = handler->ProcessHandler();
   if ( this->Values[ct_RETURN_VALUE] && *this->Values[ct_RETURN_VALUE])
     {
-    cmOStringStream str;
+    std::ostringstream str;
     str << res;
     this->Makefile->AddDefinition(
       this->Values[ct_RETURN_VALUE], str.str().c_str());
@@ -183,7 +183,7 @@ bool cmCTestHandlerCommand::CheckArgumentValue(std::string const& arg)
     unsigned int k = this->ArgumentIndex;
     if(this->Values[k])
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Called with more than one value for " << this->Arguments[k];
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
       this->ArgumentDoing = ArgumentDoingError;
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 09cf760c7b..fd0388a0b0 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -75,7 +75,7 @@ public:
         this->ParseError(atts);
         }
       // Create the log
-      cmOStringStream ostr;
+      std::ostringstream ostr;
       ostr << name << ":\n";
       int i = 0;
       for(; atts[i] != 0; i+=2)
@@ -198,7 +198,7 @@ void cmCTestMemCheckHandler::GenerateTestCommand(
 {
   std::vector<std::string>::size_type pp;
   std::string index;
-  cmOStringStream stream;
+  std::ostringstream stream;
   std::string memcheckcommand
     = cmSystemTools::ConvertToOutputPath(this->MemoryTester.c_str());
   stream << test;
@@ -834,7 +834,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckSanitizerOutput(
   int defects = 0;
   std::vector<std::string> lines;
   cmSystemTools::Split(str.c_str(), lines);
-  cmOStringStream ostr;
+  std::ostringstream ostr;
   log = "";
   for( std::vector<std::string>::iterator i = lines.begin();
        i != lines.end(); ++i)
@@ -878,7 +878,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckPurifyOutput(
 {
   std::vector<std::string> lines;
   cmSystemTools::Split(str.c_str(), lines);
-  cmOStringStream ostr;
+  std::ostringstream ostr;
   log = "";
 
   cmsys::RegularExpression pfW("^\\[[WEI]\\] ([A-Z][A-Z][A-Z][A-Z]*): ");
@@ -941,7 +941,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
 
   std::string::size_type cc;
 
-  cmOStringStream ostr;
+  std::ostringstream ostr;
   log = "";
 
   int defects = 0;
@@ -1269,7 +1269,7 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
                                                  files)
 {
   std::string index;
-  cmOStringStream stream;
+  std::ostringstream stream;
   stream << test;
   index = stream.str();
   std::string ofile = this->MemoryTesterOutputFile;
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 4c89caa4ae..a6bc844fe0 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -668,7 +668,7 @@ void cmCTestMultiProcessHandler::PrintTestList()
       {
       cmCTestLog(this->CTest, HANDLER_OUTPUT, "  Test");
       }
-    cmOStringStream indexStr;
+    std::ostringstream indexStr;
     indexStr << " #" << p.Index << ":";
     cmCTestLog(this->CTest, HANDLER_OUTPUT,
       std::setw(3 + getNumWidth(this->TestHandler->GetMaxIndex()))
diff --git a/Source/CTest/cmCTestRunScriptCommand.cxx b/Source/CTest/cmCTestRunScriptCommand.cxx
index bdf9b9cae9..7afbe04ba2 100644
--- a/Source/CTest/cmCTestRunScriptCommand.cxx
+++ b/Source/CTest/cmCTestRunScriptCommand.cxx
@@ -54,7 +54,7 @@ bool cmCTestRunScriptCommand
       int ret;
       cmCTestScriptHandler::RunScript(this->CTest, args[i].c_str(), !np,
         &ret);
-      cmOStringStream str;
+      std::ostringstream str;
       str << ret;
       this->Makefile->AddDefinition(returnVariable, str.str().c_str());
       }
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index ff55528b4a..2a3905178f 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -694,7 +694,7 @@ void cmCTestRunTest::WriteLogOutputTop(size_t completed, size_t total)
     cmCTestLog(this->CTest, HANDLER_OUTPUT, "Test");
     }
 
-  cmOStringStream indexStr;
+  std::ostringstream indexStr;
   indexStr << " #" << this->Index << ":";
   cmCTestLog(this->CTest, HANDLER_OUTPUT,
              std::setw(3 + getNumWidth(this->TestHandler->GetMaxIndex()))
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index f958e7bba4..71edd5bc82 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -299,7 +299,7 @@ int cmCTestScriptHandler::ExecuteScript(const std::string& total_script_arg)
   cmsysProcess_Delete(cp);
   if(failed)
     {
-    cmOStringStream message;
+    std::ostringstream message;
     message << "Error running command: [";
     message << result << "] ";
     for(std::vector<const char*>::iterator i = argv.begin();
diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx
index 1a39a8a29d..8ea6cef242 100644
--- a/Source/CTest/cmCTestStartCommand.cxx
+++ b/Source/CTest/cmCTestStartCommand.cxx
@@ -126,7 +126,7 @@ bool cmCTestStartCommand
     }
   if(!cmSystemTools::FileIsDirectory(sourceDir))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "given source path\n"
       << "  " << sourceDir << "\n"
       << "which is not an existing directory.  "
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx
index 07a994de64..97ec21e510 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -212,7 +212,7 @@ bool cmCTestSubmitCommand::CheckArgumentValue(std::string const& arg)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Part name \"" << arg << "\" is invalid.";
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
       this->ArgumentDoing = ArgumentDoingError;
@@ -229,7 +229,7 @@ bool cmCTestSubmitCommand::CheckArgumentValue(std::string const& arg)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "File \"" << filename << "\" does not exist. Cannot submit "
           << "a non-existent file.";
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
diff --git a/Source/CTest/cmCTestTestCommand.cxx b/Source/CTest/cmCTestTestCommand.cxx
index 231f035fbb..d2090944d3 100644
--- a/Source/CTest/cmCTestTestCommand.cxx
+++ b/Source/CTest/cmCTestTestCommand.cxx
@@ -53,7 +53,7 @@ cmCTestGenericHandler* cmCTestTestCommand::InitializeHandler()
   if ( this->Values[ctt_START] || this->Values[ctt_END] ||
     this->Values[ctt_STRIDE] )
     {
-    cmOStringStream testsToRunString;
+    std::ostringstream testsToRunString;
     if ( this->Values[ctt_START] )
       {
       testsToRunString << this->Values[ctt_START];
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 38ce3dc599..a39886401b 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1865,7 +1865,7 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
     SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
     SPACE_REGEX "*>([^<]*)</DartMeasurementFile>");
 
-  cmOStringStream ostr;
+  std::ostringstream ostr;
   bool done = false;
   std::string cxml = xml;
   while ( ! done )
@@ -2098,7 +2098,7 @@ bool cmCTestTestHandler::CleanTestOutput(std::string& output, size_t length)
   output = output.substr(0, current - begin);
 
   // Append truncation message.
-  cmOStringStream msg;
+  std::ostringstream msg;
   msg << "...\n"
     "The rest of the test output was removed since it exceeds the threshold "
     "of " << length << " bytes.\n";
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index 7206914c75..772c9aa14f 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -413,7 +413,7 @@ bool cmCTestUpdateHandler::SelectVCS()
       }
     if (this->UpdateCommand.empty())
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Cannot find UpdateCommand ";
       if (key)
         {
diff --git a/Source/CTest/cmCTestUploadCommand.cxx b/Source/CTest/cmCTestUploadCommand.cxx
index f7de29471f..5613751f42 100644
--- a/Source/CTest/cmCTestUploadCommand.cxx
+++ b/Source/CTest/cmCTestUploadCommand.cxx
@@ -55,7 +55,7 @@ bool cmCTestUploadCommand::CheckArgumentValue(std::string const& arg)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "File \"" << filename << "\" does not exist. Cannot submit "
           << "a non-existent file.";
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
diff --git a/Source/CTest/cmCTestVC.cxx b/Source/CTest/cmCTestVC.cxx
index 15f796f0ab..6e93e95c34 100644
--- a/Source/CTest/cmCTestVC.cxx
+++ b/Source/CTest/cmCTestVC.cxx
@@ -105,7 +105,7 @@ bool cmCTestVC::RunChild(char const* const* cmd, OutputParser* out,
 //----------------------------------------------------------------------------
 std::string cmCTestVC::ComputeCommandLine(char const* const* cmd)
 {
-  cmOStringStream line;
+  std::ostringstream line;
   const char* sep = "";
   for(const char* const* arg = cmd; *arg; ++arg)
     {
diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx
index 818b91082a..8fb49ca237 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -305,7 +305,7 @@ bool cmAddCustomCommandCommand
       }
 
     // No command for this output exists.
-    cmOStringStream e;
+    std::ostringstream e;
     e << "given APPEND option with output \"" << output[0]
       << "\" which is not already a custom command output.";
     this->SetError(e.str());
@@ -354,7 +354,7 @@ bool cmAddCustomCommandCommand
         }
       if(!okay)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "could not locate source file with a custom command producing \""
           << output[0] << "\" even though this command tried to create it!";
         this->SetError(e.str());
@@ -375,7 +375,7 @@ bool cmAddCustomCommandCommand
   else
     {
     bool issueMessage = true;
-    cmOStringStream e;
+    std::ostringstream e;
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0050))
     {
@@ -436,7 +436,7 @@ cmAddCustomCommandCommand
     std::string::size_type pos = o->find_first_of("#<>");
     if(pos != o->npos)
       {
-      cmOStringStream msg;
+      std::ostringstream msg;
       msg << "called with OUTPUT containing a \"" << (*o)[pos]
           << "\".  This character is not allowed.";
       this->SetError(msg.str());
diff --git a/Source/cmAddCustomTargetCommand.cxx b/Source/cmAddCustomTargetCommand.cxx
index 09c8af5540..a0e20c8f2f 100644
--- a/Source/cmAddCustomTargetCommand.cxx
+++ b/Source/cmAddCustomTargetCommand.cxx
@@ -30,7 +30,7 @@ bool cmAddCustomTargetCommand
   // Check the target name.
   if(targetName.find_first_of("/\\") != targetName.npos)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "called with invalid target name \"" << targetName
       << "\".  Target names may not contain a slash.  "
       << "Use ADD_CUSTOM_COMMAND to generate files.";
@@ -170,7 +170,7 @@ bool cmAddCustomTargetCommand
   std::string::size_type pos = targetName.find_first_of("#<>");
   if(pos != targetName.npos)
     {
-    cmOStringStream msg;
+    std::ostringstream msg;
     msg << "called with target name containing a \"" << targetName[pos]
         << "\".  This character is not allowed.";
     this->SetError(msg.str());
@@ -189,7 +189,7 @@ bool cmAddCustomTargetCommand
   if (!nameOk)
     {
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
-    cmOStringStream e;
+    std::ostringstream e;
     bool issueMessage = false;
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037))
       {
diff --git a/Source/cmAddDependenciesCommand.cxx b/Source/cmAddDependenciesCommand.cxx
index e897d81b67..b560452c41 100644
--- a/Source/cmAddDependenciesCommand.cxx
+++ b/Source/cmAddDependenciesCommand.cxx
@@ -26,7 +26,7 @@ bool cmAddDependenciesCommand
   std::string target_name = args[0];
   if(this->Makefile->IsAlias(target_name))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Cannot add target-level dependencies to alias target \""
       << target_name << "\".\n";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -35,7 +35,7 @@ bool cmAddDependenciesCommand
     {
     if (target->GetType() == cmTarget::INTERFACE_LIBRARY)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Cannot add target-level dependencies to INTERFACE library "
         "target \"" << target_name << "\".\n";
       this->SetError(e.str());
@@ -51,7 +51,7 @@ bool cmAddDependenciesCommand
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Cannot add target-level dependencies to non-existent target \""
       << target_name << "\".\n"
       << "The add_dependencies works for top-level logical targets created "
diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index c30e76432b..74dc8ebd6c 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -79,7 +79,7 @@ bool cmAddExecutableCommand
   if (!nameOk)
     {
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
-    cmOStringStream e;
+    std::ostringstream e;
     bool issueMessage = false;
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037))
       {
@@ -149,7 +149,7 @@ bool cmAddExecutableCommand
       }
     if(args.size() != 3)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "ALIAS requires exactly one target argument.";
       this->SetError(e.str());
       return false;
@@ -158,7 +158,7 @@ bool cmAddExecutableCommand
     const char *aliasedName = s->c_str();
     if(this->Makefile->IsAlias(aliasedName))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "cannot create ALIAS target \"" << exename
         << "\" because target \"" << aliasedName << "\" is itself an ALIAS.";
       this->SetError(e.str());
@@ -168,7 +168,7 @@ bool cmAddExecutableCommand
                     this->Makefile->FindTargetToUse(aliasedName, true);
     if(!aliasedTarget)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "cannot create ALIAS target \"" << exename
         << "\" because target \"" << aliasedName << "\" does not already "
         "exist.";
@@ -178,7 +178,7 @@ bool cmAddExecutableCommand
     cmTarget::TargetType type = aliasedTarget->GetType();
     if(type != cmTarget::EXECUTABLE)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "cannot create ALIAS target \"" << exename
         << "\" because target \"" << aliasedName << "\" is not an "
         "executable.";
@@ -187,7 +187,7 @@ bool cmAddExecutableCommand
       }
     if(aliasedTarget->IsImported())
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "cannot create ALIAS target \"" << exename
         << "\" because target \"" << aliasedName << "\" is IMPORTED.";
       this->SetError(e.str());
@@ -203,7 +203,7 @@ bool cmAddExecutableCommand
     // Make sure the target does not already exist.
     if(this->Makefile->FindTargetToUse(exename))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "cannot create imported target \"" << exename
         << "\" because another target with the same name already exists.";
       this->SetError(e.str());
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index bba4d41440..db2f6fb0ef 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -51,7 +51,7 @@ bool cmAddLibraryCommand
       {
       if (type == cmTarget::INTERFACE_LIBRARY)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "INTERFACE library specified with conflicting STATIC type.";
         this->SetError(e.str());
         return false;
@@ -64,7 +64,7 @@ bool cmAddLibraryCommand
       {
       if (type == cmTarget::INTERFACE_LIBRARY)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "INTERFACE library specified with conflicting SHARED type.";
         this->SetError(e.str());
         return false;
@@ -77,7 +77,7 @@ bool cmAddLibraryCommand
       {
       if (type == cmTarget::INTERFACE_LIBRARY)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "INTERFACE library specified with conflicting MODULE type.";
         this->SetError(e.str());
         return false;
@@ -90,7 +90,7 @@ bool cmAddLibraryCommand
       {
       if (type == cmTarget::INTERFACE_LIBRARY)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "INTERFACE library specified with conflicting OBJECT type.";
         this->SetError(e.str());
         return false;
@@ -103,7 +103,7 @@ bool cmAddLibraryCommand
       {
       if (type == cmTarget::INTERFACE_LIBRARY)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "INTERFACE library specified with conflicting UNKNOWN type.";
         this->SetError(e.str());
         return false;
@@ -116,7 +116,7 @@ bool cmAddLibraryCommand
       {
       if (type == cmTarget::INTERFACE_LIBRARY)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "INTERFACE library specified with conflicting ALIAS type.";
         this->SetError(e.str());
         return false;
@@ -128,21 +128,21 @@ bool cmAddLibraryCommand
       {
       if (haveSpecifiedType)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "INTERFACE library specified with conflicting/multiple types.";
         this->SetError(e.str());
         return false;
         }
       if (isAlias)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "INTERFACE library specified with conflicting ALIAS type.";
         this->SetError(e.str());
         return false;
         }
       if (excludeFromAll)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "INTERFACE library may not be used with EXCLUDE_FROM_ALL.";
         this->SetError(e.str());
         return false;
@@ -155,7 +155,7 @@ bool cmAddLibraryCommand
       {
       if (type == cmTarget::INTERFACE_LIBRARY)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "INTERFACE library may not be used with EXCLUDE_FROM_ALL.";
         this->SetError(e.str());
         return false;
@@ -175,7 +175,7 @@ bool cmAddLibraryCommand
       }
     else if(type == cmTarget::INTERFACE_LIBRARY && *s == "GLOBAL")
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "GLOBAL option may only be used with IMPORTED libraries.";
       this->SetError(e.str());
       return false;
@@ -190,14 +190,14 @@ bool cmAddLibraryCommand
     {
     if (s != args.end())
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "INTERFACE library requires no source arguments.";
       this->SetError(e.str());
       return false;
       }
     if (importGlobal && !importTarget)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "INTERFACE library specified as GLOBAL, but not as IMPORTED.";
       this->SetError(e.str());
       return false;
@@ -214,7 +214,7 @@ bool cmAddLibraryCommand
   if (!nameOk)
     {
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
-    cmOStringStream e;
+    std::ostringstream e;
     bool issueMessage = false;
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037))
       {
@@ -267,7 +267,7 @@ bool cmAddLibraryCommand
       }
     if(args.size() != 3)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "ALIAS requires exactly one target argument.";
       this->SetError(e.str());
       return false;
@@ -276,7 +276,7 @@ bool cmAddLibraryCommand
     const char *aliasedName = s->c_str();
     if(this->Makefile->IsAlias(aliasedName))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "cannot create ALIAS target \"" << libName
         << "\" because target \"" << aliasedName << "\" is itself an ALIAS.";
       this->SetError(e.str());
@@ -286,7 +286,7 @@ bool cmAddLibraryCommand
                     this->Makefile->FindTargetToUse(aliasedName, true);
     if(!aliasedTarget)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "cannot create ALIAS target \"" << libName
         << "\" because target \"" << aliasedName << "\" does not already "
         "exist.";
@@ -300,7 +300,7 @@ bool cmAddLibraryCommand
         && aliasedType != cmTarget::OBJECT_LIBRARY
         && aliasedType != cmTarget::INTERFACE_LIBRARY)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "cannot create ALIAS target \"" << libName
         << "\" because target \"" << aliasedName << "\" is not a library.";
       this->SetError(e.str());
@@ -308,7 +308,7 @@ bool cmAddLibraryCommand
       }
     if(aliasedTarget->IsImported())
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "cannot create ALIAS target \"" << libName
         << "\" because target \"" << aliasedName << "\" is IMPORTED.";
       this->SetError(e.str());
@@ -333,7 +333,7 @@ bool cmAddLibraryCommand
        (this->Makefile->GetCMakeInstance()->GetPropertyAsBool(
                                       "TARGET_SUPPORTS_SHARED_LIBS") == false))
     {
-    cmOStringStream w;
+    std::ostringstream w;
     w <<
       "ADD_LIBRARY called with " <<
       (type==cmTarget::SHARED_LIBRARY ? "SHARED" : "MODULE") <<
@@ -364,7 +364,7 @@ bool cmAddLibraryCommand
       {
       if (!cmGeneratorExpression::IsValidTargetName(libName))
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "Invalid name for IMPORTED INTERFACE library target: " << libName;
         this->SetError(e.str());
         return false;
@@ -374,7 +374,7 @@ bool cmAddLibraryCommand
     // Make sure the target does not already exist.
     if(this->Makefile->FindTargetToUse(libName))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "cannot create imported target \"" << libName
         << "\" because another target with the same name already exists.";
       this->SetError(e.str());
@@ -413,7 +413,7 @@ bool cmAddLibraryCommand
     if (!cmGeneratorExpression::IsValidTargetName(libName)
         || libName.find("::") != std::string::npos)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Invalid name for INTERFACE library target: " << libName;
       this->SetError(e.str());
       return false;
diff --git a/Source/cmAddSubDirectoryCommand.cxx b/Source/cmAddSubDirectoryCommand.cxx
index 477a3d9cac..8db5078a93 100644
--- a/Source/cmAddSubDirectoryCommand.cxx
+++ b/Source/cmAddSubDirectoryCommand.cxx
@@ -81,7 +81,7 @@ bool cmAddSubDirectoryCommand::InitialPass
     if(!cmSystemTools::IsSubDirectory(srcPath,
                                       this->Makefile->GetCurrentDirectory()))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "not given a binary directory but the given source directory "
         << "\"" << srcPath << "\" is not a subdirectory of \""
         << this->Makefile->GetCurrentDirectory() << "\".  "
diff --git a/Source/cmAddTestCommand.cxx b/Source/cmAddTestCommand.cxx
index 2531a1a76d..65d295b1d7 100644
--- a/Source/cmAddTestCommand.cxx
+++ b/Source/cmAddTestCommand.cxx
@@ -51,7 +51,7 @@ bool cmAddTestCommand
     // allow it to be duplicated.
     if(!test->GetOldStyle())
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << " given test name \"" << args[0]
         << "\" which already exists in this directory.";
       this->SetError(e.str());
@@ -135,7 +135,7 @@ bool cmAddTestCommand::HandleNameMode(std::vector<std::string> const& args)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << " given unknown argument:\n  " << args[i] << "\n";
       this->SetError(e.str());
       return false;
@@ -159,7 +159,7 @@ bool cmAddTestCommand::HandleNameMode(std::vector<std::string> const& args)
   // Require a unique test name within the directory.
   if(this->Makefile->GetTest(name))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << " given test NAME \"" << name
       << "\" which already exists in this directory.";
     this->SetError(e.str());
diff --git a/Source/cmBreakCommand.cxx b/Source/cmBreakCommand.cxx
index ff527db543..34245b3214 100644
--- a/Source/cmBreakCommand.cxx
+++ b/Source/cmBreakCommand.cxx
@@ -18,7 +18,7 @@ bool cmBreakCommand::InitialPass(std::vector<std::string> const &args,
   if(!this->Makefile->IsLoopBlock())
     {
     bool issueMessage = true;
-    cmOStringStream e;
+    std::ostringstream e;
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0055))
       {
@@ -53,7 +53,7 @@ bool cmBreakCommand::InitialPass(std::vector<std::string> const &args,
   if(!args.empty())
     {
     bool issueMessage = true;
-    cmOStringStream e;
+    std::ostringstream e;
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0055))
       {
diff --git a/Source/cmBuildCommand.cxx b/Source/cmBuildCommand.cxx
index 93f7801254..5d324371ce 100644
--- a/Source/cmBuildCommand.cxx
+++ b/Source/cmBuildCommand.cxx
@@ -78,7 +78,7 @@ bool cmBuildCommand
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "unknown argument \"" << args[i] << "\"";
       this->SetError(e.str());
       return false;
diff --git a/Source/cmCMakeMinimumRequired.cxx b/Source/cmCMakeMinimumRequired.cxx
index 384e0a7e65..8591ed6cef 100644
--- a/Source/cmCMakeMinimumRequired.cxx
+++ b/Source/cmCMakeMinimumRequired.cxx
@@ -78,7 +78,7 @@ bool cmCMakeMinimumRequired
             &required_major, &required_minor,
             &required_patch, &required_tweak) < 2)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "could not parse VERSION \"" << version_string << "\".";
     this->SetError(e.str());
     return false;
@@ -97,7 +97,7 @@ bool cmCMakeMinimumRequired
       current_tweak < required_tweak))
     {
     // The current version is too low.
-    cmOStringStream e;
+    std::ostringstream e;
     e << "CMake " << version_string
       << " or higher is required.  You are running version "
       << cmVersion::GetCMakeVersion();
@@ -132,7 +132,7 @@ bool cmCMakeMinimumRequired::EnforceUnknownArguments()
 {
   if(!this->UnknownArguments.empty())
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "called with unknown argument \""
       << this->UnknownArguments[0] << "\".";
     this->SetError(e.str());
diff --git a/Source/cmCMakePolicyCommand.cxx b/Source/cmCMakePolicyCommand.cxx
index ddd5d6ad59..9662fbfc92 100644
--- a/Source/cmCMakePolicyCommand.cxx
+++ b/Source/cmCMakePolicyCommand.cxx
@@ -56,7 +56,7 @@ bool cmCMakePolicyCommand
     return this->HandleVersionMode(args);
     }
 
-  cmOStringStream e;
+  std::ostringstream e;
   e << "given unknown first argument \"" << args[0] << "\"";
   this->SetError(e.str());
   return false;
@@ -82,7 +82,7 @@ bool cmCMakePolicyCommand::HandleSetMode(std::vector<std::string> const& args)
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "SET given unrecognized policy status \"" << args[2] << "\"";
     this->SetError(e.str());
     return false;
@@ -113,7 +113,7 @@ bool cmCMakePolicyCommand::HandleGetMode(std::vector<std::string> const& args)
   cmPolicies::PolicyID pid;
   if(!this->Makefile->GetPolicies()->GetPolicyID(id.c_str(), pid))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "GET given policy \"" << id << "\" which is not known to this "
       << "version of CMake.";
     this->SetError(e.str());
@@ -140,7 +140,7 @@ bool cmCMakePolicyCommand::HandleGetMode(std::vector<std::string> const& args)
     case cmPolicies::REQUIRED_ALWAYS:
       // The policy is required to be set before anything needs it.
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << this->Makefile->GetPolicies()->GetRequiredPolicyError(pid)
         << "\n"
         << "The call to cmake_policy(GET " << id << " ...) at which this "
diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index b304f28ddd..d0dc30a6a2 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -769,7 +769,7 @@ void CCONV cmSourceFileSetName(void *arg, const char* name, const char* dir,
       }
     }
 
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Cannot find source file \"" << pathname << "\"";
   e << "\n\nTried extensions";
   for( std::vector<std::string>::const_iterator ext = sourceExts.begin();
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 2f1cf10dfb..0c4d76cbbb 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -240,7 +240,7 @@ int cmCTest::HTTPRequest(std::string url, HTTPMethod method,
 //----------------------------------------------------------------------
 std::string cmCTest::MakeURLSafe(const std::string& str)
 {
-  cmOStringStream ost;
+  std::ostringstream ost;
   char buffer[10];
   for ( std::string::size_type pos = 0; pos < str.size(); pos ++ )
     {
@@ -1302,7 +1302,7 @@ int cmCTest::RunTest(std::vector<const char*> argv,
     inst.TimeOut = timeout;
 
     // Capture output of the child ctest.
-    cmOStringStream oss;
+    std::ostringstream oss;
     inst.SetStreams(&oss, &oss);
 
     std::vector<std::string> args;
@@ -1316,7 +1316,7 @@ int cmCTest::RunTest(std::vector<const char*> argv,
         if (strcmp(argv[i],"--build-generator") == 0 && timeout > 0)
           {
           args.push_back("--test-timeout");
-          cmOStringStream msg;
+          std::ostringstream msg;
           msg << timeout;
           args.push_back(msg.str());
           }
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index e19d32caac..deb889698c 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -27,7 +27,7 @@ class cmCTestStartCommand;
 
 #define cmCTestLog(ctSelf, logType, msg) \
   do { \
-  cmOStringStream cmCTestLog_msg; \
+  std::ostringstream cmCTestLog_msg; \
   cmCTestLog_msg << msg; \
   (ctSelf)->Log(cmCTest::logType, __FILE__, __LINE__,\
                 cmCTestLog_msg.str().c_str());\
diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx
index 64b67c968d..747b7e434a 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -103,7 +103,7 @@ char* cmCommandArgumentParserHelper::ExpandSpecialVariable(const char* key,
       }
     return this->EmptyVariable;
     }
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Syntax $" << key << "{} is not supported.  "
     << "Only ${}, $ENV{}, and $CACHE{} are allowed.";
   this->SetError(e.str());
@@ -118,7 +118,7 @@ char* cmCommandArgumentParserHelper::ExpandVariable(const char* var)
     }
   if(this->FileLine >= 0 && strcmp(var, "CMAKE_CURRENT_LIST_LINE") == 0)
     {
-    cmOStringStream ostr;
+    std::ostringstream ostr;
     ostr << this->FileLine;
     return this->AddString(ostr.str());
     }
@@ -136,7 +136,7 @@ char* cmCommandArgumentParserHelper::ExpandVariable(const char* var)
           cmSystemTools::IsSubDirectory(this->FileName,
                                      this->Makefile->GetHomeOutputDirectory()))
         {
-        cmOStringStream msg;
+        std::ostringstream msg;
         cmListFileBacktrace bt(this->Makefile->GetLocalGenerator());
         cmListFileContext lfc;
         lfc.FilePath = this->FileName;
@@ -253,7 +253,7 @@ bool cmCommandArgumentParserHelper::HandleEscapeSymbol
     break;
   default:
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Invalid escape sequence \\" << symbol;
     this->SetError(e.str());
     }
@@ -335,7 +335,7 @@ int cmCommandArgumentParserHelper::LexInput(char* buf, int maxlen)
 void cmCommandArgumentParserHelper::Error(const char* str)
 {
   unsigned long pos = static_cast<unsigned long>(this->InputBufferPos);
-  cmOStringStream ostr;
+  std::ostringstream ostr;
   ostr << str << " (" << pos << ")";
   this->SetError(ostr.str());
 }
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index a636d23c73..20c71fba69 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -710,7 +710,7 @@ void cmComputeLinkDepends::CleanConstraintGraph()
 void cmComputeLinkDepends::DisplayConstraintGraph()
 {
   // Display the graph nodes and their edges.
-  cmOStringStream e;
+  std::ostringstream e;
   for(unsigned int i=0; i < this->EntryConstraintGraph.size(); ++i)
     {
     EdgeList const& nl = this->EntryConstraintGraph[i];
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index f4fa5c6fe0..8d24bd0dae 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1342,7 +1342,7 @@ void cmComputeLinkInformation::AddFrameworkItem(std::string const& item)
   // Try to separate the framework name and path.
   if(!this->SplitFramework.find(item.c_str()))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Could not parse framework path \"" << item << "\" "
       << "linked by target " << this->Target->GetName() << ".";
     cmSystemTools::Error(e.str().c_str());
@@ -1389,7 +1389,7 @@ void cmComputeLinkInformation::DropDirectoryItem(std::string const& item)
 {
   // A full path to a directory was found as a link item.  Warn the
   // user.
-  cmOStringStream e;
+  std::ostringstream e;
   e << "WARNING: Target \"" << this->Target->GetName()
     << "\" requests linking to directory \"" << item << "\".  "
     << "Targets may link only to libraries.  "
@@ -1505,7 +1505,7 @@ void cmComputeLinkInformation::HandleBadFullItem(std::string const& item,
       if(!this->CMakeInstance->GetPropertyAsBool(wid))
         {
         this->CMakeInstance->SetProperty(wid, "1");
-        cmOStringStream w;
+        std::ostringstream w;
         w << (this->Makefile->GetPolicies()
               ->GetPolicyWarning(cmPolicies::CMP0008)) << "\n"
           << "Target \"" << this->Target->GetName() << "\" links to item\n"
@@ -1524,7 +1524,7 @@ void cmComputeLinkInformation::HandleBadFullItem(std::string const& item,
     case cmPolicies::REQUIRED_IF_USED:
     case cmPolicies::REQUIRED_ALWAYS:
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << (this->Makefile->GetPolicies()->
             GetRequiredPolicyError(cmPolicies::CMP0008)) << "\n"
           << "Target \"" << this->Target->GetName() << "\" links to item\n"
@@ -1554,7 +1554,7 @@ bool cmComputeLinkInformation::FinishLinkerSearchDirectories()
       if(!this->CMakeInstance->GetPropertyAsBool("CMP0003-WARNING-GIVEN"))
         {
         this->CMakeInstance->SetProperty("CMP0003-WARNING-GIVEN", "1");
-        cmOStringStream w;
+        std::ostringstream w;
         this->PrintLinkPolicyDiagnosis(w);
         this->CMakeInstance->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
                                           this->Target->GetBacktrace());
@@ -1569,7 +1569,7 @@ bool cmComputeLinkInformation::FinishLinkerSearchDirectories()
     case cmPolicies::REQUIRED_IF_USED:
     case cmPolicies::REQUIRED_ALWAYS:
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << (this->Makefile->GetPolicies()->
             GetRequiredPolicyError(cmPolicies::CMP0003)) << "\n";
       this->PrintLinkPolicyDiagnosis(e);
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 75d3967bc3..cf2b88e4ac 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -361,7 +361,7 @@ void cmComputeTargetDepends::AddTargetDepend(
     cmMakefile *makefile = depender->GetMakefile();
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     bool issueMessage = false;
-    cmOStringStream e;
+    std::ostringstream e;
     switch(depender->GetPolicyStatusCMP0046())
       {
       case cmPolicies::WARN:
@@ -539,7 +539,7 @@ cmComputeTargetDepends
                             bool strong)
 {
   // Construct the error message.
-  cmOStringStream e;
+  std::ostringstream e;
   e << "The inter-target dependency graph contains the following "
     << "strongly connected component (cycle):\n";
   std::vector<NodeList> const& components = ccg.GetComponents();
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index aba26de10c..73b4ba2988 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -119,7 +119,7 @@ const char* cmConditionEvaluator::GetDefinitionIfUnquoted(
 
     if(!hasBeenReported)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << (this->Makefile.GetPolicies()->GetPolicyWarning(
         cmPolicies::CMP0054)) << "\n";
       e << "Quoted variables like \"" << argument.GetValue() <<
@@ -169,7 +169,7 @@ bool cmConditionEvaluator::IsKeyword(std::string const& keyword,
 
     if(!hasBeenReported)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << (this->Makefile.GetPolicies()->GetPolicyWarning(
         cmPolicies::CMP0054)) << "\n";
       e << "Quoted keywords like \"" << argument.GetValue() <<
@@ -559,7 +559,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
         cmsys::RegularExpression regEntry;
         if ( !regEntry.compile(rex) )
           {
-          cmOStringStream error;
+          std::ostringstream error;
           error << "Regular expression \"" << rex << "\" cannot compile";
           errorString = error.str();
           status = cmake::FATAL_ERROR;
diff --git a/Source/cmConfigureFileCommand.cxx b/Source/cmConfigureFileCommand.cxx
index cc6cf5f987..fa7f486d8e 100644
--- a/Source/cmConfigureFileCommand.cxx
+++ b/Source/cmConfigureFileCommand.cxx
@@ -34,7 +34,7 @@ bool cmConfigureFileCommand
   // If the input location is a directory, error out.
   if(cmSystemTools::FileIsDirectory(this->InputFile))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "input location\n"
       << "  " << this->InputFile << "\n"
       << "is a directory but a file was expected.";
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 0030b841e2..002e75a0e4 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -150,7 +150,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
       }
     else
       {
-      cmOStringStream m;
+      std::ostringstream m;
       m << "try_compile given unknown argument \"" << argv[i] << "\".";
       this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, m.str());
       }
@@ -220,7 +220,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
   // do not allow recursive try Compiles
   if (this->BinaryDirectory == this->Makefile->GetHomeOutputDirectory())
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Attempt at a recursive or nested TRY_COMPILE in directory\n"
       << "  " << this->BinaryDirectory << "\n";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -256,7 +256,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
         }
       else
         {
-        cmOStringStream err;
+        std::ostringstream err;
         err << "Unknown extension \"" << ext << "\" for file\n"
             << "  " << *si << "\n"
             << "try_compile() works only for enabled languages.  "
@@ -282,7 +282,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
     FILE *fout = cmsys::SystemTools::Fopen(outFileName,"w");
     if (!fout)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Failed to open\n"
         << "  " << outFileName << "\n"
         << cmSystemTools::GetLastSystemError();
@@ -337,7 +337,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
         if(this->Makefile->PolicyOptionalWarningEnabled(
              "CMAKE_POLICY_WARNING_CMP0056"))
           {
-          cmOStringStream w;
+          std::ostringstream w;
           w << (this->Makefile->GetCMakeInstance()->GetPolicies()
                 ->GetPolicyWarning(cmPolicies::CMP0056)) << "\n"
             "For compatibility with older versions of CMake, try_compile "
@@ -553,7 +553,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
          !cmSystemTools::CopyFileAlways(this->OutputFile,
                                         copyFile))
         {
-        cmOStringStream emsg;
+        std::ostringstream emsg;
         emsg << "Cannot copy output executable\n"
              << "  '" << this->OutputFile << "'\n"
              << "to destination specified by COPY_FILE:\n"
@@ -691,7 +691,7 @@ void cmCoreTryCompile::FindOutputFile(const std::string& targetName)
       }
     }
 
-  cmOStringStream emsg;
+  std::ostringstream emsg;
   emsg << "Unable to find the executable at any of:\n";
   for (unsigned int i = 0; i < searchDirs.size(); ++i)
     {
diff --git a/Source/cmDefinePropertyCommand.cxx b/Source/cmDefinePropertyCommand.cxx
index 6b729de1e1..5ff0186da9 100644
--- a/Source/cmDefinePropertyCommand.cxx
+++ b/Source/cmDefinePropertyCommand.cxx
@@ -53,7 +53,7 @@ bool cmDefinePropertyCommand
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "given invalid scope " << args[0] << ".  "
       << "Valid scopes are "
       << "GLOBAL, DIRECTORY, TARGET, SOURCE, "
@@ -100,7 +100,7 @@ bool cmDefinePropertyCommand
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "given invalid argument \"" << args[i] << "\".";
       this->SetError(e.str());
       return false;
diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx
index 947db82a40..d4190112d4 100644
--- a/Source/cmDepends.cxx
+++ b/Source/cmDepends.cxx
@@ -123,7 +123,7 @@ void cmDepends::Clear(const char *file)
   // Print verbose output.
   if(this->Verbose)
     {
-    cmOStringStream msg;
+    std::ostringstream msg;
     msg << "Clearing dependencies in \"" << file << "\"." << std::endl;
     cmSystemTools::Stdout(msg.str().c_str());
     }
@@ -213,7 +213,7 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends,
       // Print verbose output.
       if(this->Verbose)
         {
-        cmOStringStream msg;
+        std::ostringstream msg;
         msg << "Dependee \"" << dependee
             << "\" does not exist for depender \""
             << depender << "\"." << std::endl;
@@ -235,7 +235,7 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends,
           // Print verbose output.
           if(this->Verbose)
             {
-            cmOStringStream msg;
+            std::ostringstream msg;
             msg << "Dependee \"" << dependee
                 << "\" is newer than depender \""
                 << depender << "\"." << std::endl;
@@ -257,7 +257,7 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends,
           // Print verbose output.
           if(this->Verbose)
             {
-            cmOStringStream msg;
+            std::ostringstream msg;
             msg << "Dependee \"" << dependee
                 << "\" is newer than depends file \""
                 << internalDependsFileName << "\"." << std::endl;
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index cab23b7598..d062987b10 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -532,7 +532,7 @@ cmELFInternalImpl<Types>
         break;
         }
 #endif
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Unknown ELF file type " << eti;
       this->SetErrorMessage(e.str().c_str());
       return;
diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx
index 11f8ae55ba..0707906482 100644
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@@ -189,7 +189,7 @@ bool cmExecuteProcessCommand
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << " given unknown argument \"" << args[i] << "\".";
       this->SetError(e.str());
       return false;
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 134ee98aab..a28ec4833b 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -45,7 +45,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "given target \"" << te->GetName() << "\" more than once.";
       this->Makefile->GetCMakeInstance()
           ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
@@ -70,7 +70,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     cmTarget* te = *tei;
     if (te->GetProperty("INTERFACE_SOURCES"))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Target \""
         << te->GetName()
         << "\" has a populated INTERFACE_SOURCES property.  This is not "
@@ -313,7 +313,7 @@ cmExportBuildFileGenerator
     return;
     }
 
-  cmOStringStream e;
+  std::ostringstream e;
   e << "export called with target \"" << depender->GetName()
     << "\" which requires target \"" << dependee->GetName() << "\" ";
   if (occurrences == 0)
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index db21c49fb6..76283d462e 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -89,7 +89,7 @@ bool cmExportCommand
     if(cmSystemTools::GetFilenameLastExtension(this->Filename.GetCString())
       != ".cmake")
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "FILE option given filename \"" << this->Filename.GetString()
         << "\" which does not have an extension of \".cmake\".\n";
       this->SetError(e.str());
@@ -103,7 +103,7 @@ bool cmExportCommand
     {
     if(!this->Makefile->CanIWriteThisFile(fname.c_str()))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "FILE option given filename \"" << fname
         << "\" which is in the source tree.\n";
       this->SetError(e.str());
@@ -126,7 +126,7 @@ bool cmExportCommand
     {
     if (this->Append.IsEnabled())
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "EXPORT signature does not recognise the APPEND option.";
       this->SetError(e.str());
       return false;
@@ -134,7 +134,7 @@ bool cmExportCommand
 
     if (this->ExportOld.IsEnabled())
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "EXPORT signature does not recognise the "
         "EXPORT_LINK_INTERFACE_LIBRARIES option.";
       this->SetError(e.str());
@@ -145,7 +145,7 @@ bool cmExportCommand
     std::string setName = this->ExportSetName.GetString();
     if (setMap.find(setName) == setMap.end())
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Export set \"" << setName << "\" not found.";
       this->SetError(e.str());
       return false;
@@ -161,7 +161,7 @@ bool cmExportCommand
       {
       if (this->Makefile->IsAlias(*currentTarget))
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "given ALIAS target \"" << *currentTarget
           << "\" which may not be exported.";
         this->SetError(e.str());
@@ -172,7 +172,7 @@ bool cmExportCommand
         {
         if(target->GetType() == cmTarget::OBJECT_LIBRARY)
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << "given OBJECT library \"" << *currentTarget
             << "\" which may not be exported.";
           this->SetError(e.str());
@@ -181,7 +181,7 @@ bool cmExportCommand
         }
       else
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "given target \"" << *currentTarget
           << "\" which is not built by this project.";
         this->SetError(e.str());
@@ -261,7 +261,7 @@ bool cmExportCommand::HandlePackage(std::vector<std::string> const& args)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "PACKAGE given unknown argument: " << args[i];
       this->SetError(e.str());
       return false;
@@ -278,7 +278,7 @@ bool cmExportCommand::HandlePackage(std::vector<std::string> const& args)
   cmsys::RegularExpression packageRegex(packageExpr);
   if(!packageRegex.find(package.c_str()))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "PACKAGE given invalid package name \"" << package << "\".  "
       << "Package names must match \"" << packageExpr << "\".";
     this->SetError(e.str());
@@ -314,7 +314,7 @@ void cmExportCommand::ReportRegistryError(std::string const& msg,
                                           std::string const& key,
                                           long err)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << msg << "\n"
     << "  HKEY_CURRENT_USER\\" << key << "\n";
   wchar_t winmsg[1024];
@@ -355,7 +355,7 @@ void cmExportCommand::StorePackageRegistryWin(std::string const& package,
   RegCloseKey(hKey);
   if(err != ERROR_SUCCESS)
     {
-    cmOStringStream msg;
+    std::ostringstream msg;
     msg << "Cannot set registry value \"" << hash << "\" under key";
     this->ReportRegistryError(msg.str(), key, err);
     return;
@@ -400,7 +400,7 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package,
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Cannot create package registry file:\n"
         << "  " << fname << "\n"
         << cmSystemTools::GetLastSystemError() << "\n";
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 1f39d7af97..0254cb423f 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -81,7 +81,7 @@ bool cmExportFileGenerator::GenerateImportFile()
   if(!foutPtr.get() || !*foutPtr)
     {
     std::string se = cmSystemTools::GetLastSystemError();
-    cmOStringStream e;
+    std::ostringstream e;
     e << "cannot write to file \"" << this->MainImportFile
       << "\": " << se;
     cmSystemTools::Error(e.str().c_str());
@@ -247,7 +247,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       continue;
       }
     cmake::MessageType messageType = cmake::FATAL_ERROR;
-    cmOStringStream e;
+    std::ostringstream e;
     if (genexPos != std::string::npos)
       {
       switch (target->GetPolicyStatusCMP0041())
@@ -295,7 +295,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
           {
           case cmPolicies::WARN:
             {
-            cmOStringStream s;
+            std::ostringstream s;
             s << target->GetMakefile()->GetPolicies()
                       ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
             s << "Directory:\n    \"" << *li << "\"\nin "
@@ -391,7 +391,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
   if (cge->GetHadContextSensitiveCondition())
     {
     cmMakefile* mf = target->GetMakefile();
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Target \"" << target->GetName() << "\" is installed with "
     "INCLUDES DESTINATION set to a context sensitive path.  Paths which "
     "depend on the configuration, policy values or the link interface are "
@@ -473,7 +473,7 @@ void getCompatibleInterfaceProperties(cmTarget *target,
   if (!info)
     {
     cmMakefile* mf = target->GetMakefile();
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Exporting the target \"" << target->GetName() << "\" is not "
         "allowed since its linker language cannot be determined";
     mf->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -773,7 +773,7 @@ cmExportFileGenerator
   if(newCMP0022Behavior && !this->ExportOld)
     {
     cmMakefile *mf = target->GetMakefile();
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Target \"" << target->GetName() << "\" has policy CMP0022 enabled, "
          "but also has old-style LINK_INTERFACE_LIBRARIES properties "
          "populated, but it was exported without the "
@@ -857,7 +857,7 @@ cmExportFileGenerator
       {
       std::string prop = "IMPORTED_LINK_INTERFACE_MULTIPLICITY";
       prop += suffix;
-      cmOStringStream m;
+      std::ostringstream m;
       m << iface->Multiplicity;
       properties[prop] = m.str();
       }
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 3f5866aeb5..98ed8184a4 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -56,7 +56,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "install(EXPORT \""
         << this->IEGen->GetExportSet()->GetName()
         << "\" ...) " << "includes target \"" << te->Target->GetName()
@@ -133,7 +133,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
     if (te->GetProperty("INTERFACE_SOURCES"))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Target \""
         << te->GetName()
         << "\" has a populated INTERFACE_SOURCES property.  This is not "
@@ -290,7 +290,7 @@ cmExportInstallFileGenerator::GenerateImportFileConfig(
   if(!exportFileStream)
     {
     std::string se = cmSystemTools::GetLastSystemError();
-    cmOStringStream e;
+    std::ostringstream e;
     e << "cannot write to file \"" << fileName
       << "\": " << se;
     cmSystemTools::Error(e.str().c_str());
@@ -516,7 +516,7 @@ cmExportInstallFileGenerator
                              cmTarget* dependee,
                              int occurrences)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "install(EXPORT \""
     << this->IEGen->GetExportSet()->GetName()
     << "\" ...) "
diff --git a/Source/cmExprParserHelper.cxx b/Source/cmExprParserHelper.cxx
index cc35f84cd6..6016c4cce3 100644
--- a/Source/cmExprParserHelper.cxx
+++ b/Source/cmExprParserHelper.cxx
@@ -99,7 +99,7 @@ int cmExprParserHelper::LexInput(char* buf, int maxlen)
 void cmExprParserHelper::Error(const char* str)
 {
   unsigned long pos = static_cast<unsigned long>(this->InputBufferPos);
-  cmOStringStream ostr;
+  std::ostringstream ostr;
   ostr << str << " (" << pos << ")";
   this->ErrorString = ostr.str();
 }
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index cc42bcae6b..eb50a7dfb4 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -454,7 +454,7 @@ cmExtraCodeLiteGenerator::GetBuildCommand(const cmMakefile* mf) const
   else if ( generator == "MinGW Makefiles" ||
             generator == "Unix Makefiles" )
     {
-    cmOStringStream ss;
+    std::ostringstream ss;
     ss << make << " -j " << this->CpuCount;
     buildCommand = ss.str();
     }
@@ -482,7 +482,7 @@ cmExtraCodeLiteGenerator::GetSingleFileBuildCommand
   std::string generator = mf->GetSafeDefinition("CMAKE_GENERATOR");
   if ( generator == "Unix Makefiles" || generator == "MinGW Makefiles" )
     {
-    cmOStringStream ss;
+    std::ostringstream ss;
     ss << make << " -f$(ProjectPath)/Makefile $(CurrentFileName).cpp.o";
     buildCommand = ss.str();
     }
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 3c2dfa5cd1..0306f189f9 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -404,7 +404,7 @@ bool cmFileCommand::HandleHashCommand(std::vector<std::string> const& args)
 #if defined(CMAKE_BUILD_WITH_CMAKE)
   if(args.size() != 3)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << args[0] << " requires a file name and output variable";
     this->SetError(e.str());
     return false;
@@ -419,14 +419,14 @@ bool cmFileCommand::HandleHashCommand(std::vector<std::string> const& args)
       this->Makefile->AddDefinition(args[2], out.c_str());
       return true;
       }
-    cmOStringStream e;
+    std::ostringstream e;
     e << args[0] << " failed to read file \"" << args[1] << "\": "
       << cmSystemTools::GetLastSystemError();
     this->SetError(e.str());
     }
   return false;
 #else
-  cmOStringStream e;
+  std::ostringstream e;
   e << args[0] << " not available during bootstrap";
   this->SetError(e.str().c_str());
   return false;
@@ -519,7 +519,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
       if(sscanf(args[i].c_str(), "%d", &limit_input) != 1 ||
          limit_input < 0)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "STRINGS option LIMIT_INPUT value \""
           << args[i] << "\" is not an unsigned integer.";
         this->SetError(e.str());
@@ -532,7 +532,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
       if(sscanf(args[i].c_str(), "%d", &limit_output) != 1 ||
          limit_output < 0)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "STRINGS option LIMIT_OUTPUT value \""
           << args[i] << "\" is not an unsigned integer.";
         this->SetError(e.str());
@@ -545,7 +545,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
       int count;
       if(sscanf(args[i].c_str(), "%d", &count) != 1 || count < 0)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "STRINGS option LIMIT_COUNT value \""
           << args[i] << "\" is not an unsigned integer.";
         this->SetError(e.str());
@@ -559,7 +559,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
       int len;
       if(sscanf(args[i].c_str(), "%d", &len) != 1 || len < 0)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "STRINGS option LENGTH_MINIMUM value \""
           << args[i] << "\" is not an unsigned integer.";
         this->SetError(e.str());
@@ -573,7 +573,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
       int len;
       if(sscanf(args[i].c_str(), "%d", &len) != 1 || len < 0)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "STRINGS option LENGTH_MAXIMUM value \""
           << args[i] << "\" is not an unsigned integer.";
         this->SetError(e.str());
@@ -586,7 +586,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
       {
       if(!regex.compile(args[i].c_str()))
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "STRINGS option REGEX value \""
           << args[i] << "\" could not be compiled.";
         this->SetError(e.str());
@@ -603,7 +603,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
         }
       else
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "STRINGS option ENCODING \""
           << args[i] << "\" not recognized.";
         this->SetError(e.str());
@@ -613,7 +613,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "STRINGS given unknown argument \""
         << args[i] << "\"";
       this->SetError(e.str());
@@ -641,7 +641,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
 #endif
   if(!fin)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "STRINGS file \"" << fileName << "\" cannot be read.";
     this->SetError(e.str());
     return false;
@@ -1037,7 +1037,7 @@ cmFileCommand::HandleDifferentCommand(std::vector<std::string> const& args)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "DIFFERENT given unknown argument " << args[i];
       this->SetError(e.str());
       return false;
@@ -1152,7 +1152,7 @@ protected:
     {
     if(permissions && !cmSystemTools::SetPermissions(toFile, permissions))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << this->Name << " cannot set permissions on \"" << toFile << "\"";
       this->FileCommand->SetError(e.str());
       return false;
@@ -1176,7 +1176,7 @@ protected:
     else if(arg == "SETGID")        { permissions |= mode_setgid; }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << this->Name << " given invalid permission \"" << arg << "\".";
       this->FileCommand->SetError(e.str());
       return false;
@@ -1203,7 +1203,7 @@ protected:
   virtual bool ReportMissing(const char* fromFile)
     {
     // The input file does not exist and installation is not optional.
-    cmOStringStream e;
+    std::ostringstream e;
     e << this->Name << " cannot find \"" << fromFile << "\".";
     this->FileCommand->SetError(e.str());
     return false;
@@ -1236,14 +1236,14 @@ protected:
 
   void NotBeforeMatch(std::string const& arg)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "option " << arg << " may not appear before PATTERN or REGEX.";
     this->FileCommand->SetError(e.str());
     this->Doing = DoingError;
     }
   void NotAfterMatch(std::string const& arg)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "option " << arg << " may not appear after PATTERN or REGEX.";
     this->FileCommand->SetError(e.str());
     this->Doing = DoingError;
@@ -1281,7 +1281,7 @@ bool cmFileCopier::Parse(std::vector<std::string> const& args)
     if(!this->CheckKeyword(args[i]) &&
        !this->CheckValue(args[i]))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "called with unknown argument \"" << args[i] << "\".";
       this->FileCommand->SetError(e.str());
       return false;
@@ -1297,7 +1297,7 @@ bool cmFileCopier::Parse(std::vector<std::string> const& args)
   // Require a destination.
   if(this->Destination.empty())
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << this->Name << " given no DESTINATION";
     this->FileCommand->SetError(e.str());
     return false;
@@ -1477,7 +1477,7 @@ bool cmFileCopier::CheckValue(std::string const& arg)
         }
       else
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "could not compile PATTERN \"" << arg << "\".";
         this->FileCommand->SetError(e.str());
         this->Doing = DoingError;
@@ -1493,7 +1493,7 @@ bool cmFileCopier::CheckValue(std::string const& arg)
         }
       else
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "could not compile REGEX \"" << arg << "\".";
         this->FileCommand->SetError(e.str());
         this->Doing = DoingError;
@@ -1573,7 +1573,7 @@ bool cmFileCopier::Install(const char* fromFile, const char* toFile)
 {
   if(!*fromFile)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "INSTALL encountered an empty string input file name.";
     this->FileCommand->SetError(e.str());
     return false;
@@ -1614,7 +1614,7 @@ bool cmFileCopier::InstallSymlink(const char* fromFile, const char* toFile)
   std::string symlinkTarget;
   if(!cmSystemTools::ReadSymlink(fromFile, symlinkTarget))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << this->Name << " cannot read symlink \"" << fromFile
       << "\" to duplicate at \"" << toFile << "\".";
     this->FileCommand->SetError(e.str());
@@ -1647,7 +1647,7 @@ bool cmFileCopier::InstallSymlink(const char* fromFile, const char* toFile)
     // Create the symlink.
     if(!cmSystemTools::CreateSymlink(symlinkTarget, toFile))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << this->Name <<  " cannot duplicate symlink \"" << fromFile
         << "\" at \"" << toFile << "\".";
       this->FileCommand->SetError(e.str());
@@ -1679,7 +1679,7 @@ bool cmFileCopier::InstallFile(const char* fromFile, const char* toFile,
   // Copy the file.
   if(copy && !cmSystemTools::CopyAFile(fromFile, toFile, true))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << this->Name << " cannot copy file \"" << fromFile
       << "\" to \"" << toFile << "\".";
     this->FileCommand->SetError(e.str());
@@ -1698,7 +1698,7 @@ bool cmFileCopier::InstallFile(const char* fromFile, const char* toFile,
       }
     if (!cmSystemTools::CopyFileTime(fromFile, toFile))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << this->Name << " cannot set modification time on \""
         << toFile << "\"";
       this->FileCommand->SetError(e.str());
@@ -1730,7 +1730,7 @@ bool cmFileCopier::InstallDirectory(const char* source,
   // Make sure the destination directory exists.
   if(!cmSystemTools::MakeDirectory(destination))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << this->Name << " cannot make directory \"" << destination << "\": "
       << cmSystemTools::GetLastSystemError();
     this->FileCommand->SetError(e.str());
@@ -2075,7 +2075,7 @@ bool cmFileInstaller::CheckKeyword(std::string const& arg)
   else if(arg == "COMPONENTS" || arg == "CONFIGURATIONS" ||
           arg == "PROPERTIES")
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "INSTALL called with old-style " << arg << " argument.  "
       << "This script was generated with an older version of CMake.  "
       << "Re-run this cmake version on your build tree.";
@@ -2143,7 +2143,7 @@ bool cmFileInstaller
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Option TYPE given unknown value \"" << stype << "\".";
     this->FileCommand->SetError(e.str());
     return false;
@@ -2288,7 +2288,7 @@ cmFileCommand::HandleRPathChangeCommand(std::vector<std::string> const& args)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "RPATH_CHANGE given unknown argument " << args[i];
       this->SetError(e.str());
       return false;
@@ -2311,7 +2311,7 @@ cmFileCommand::HandleRPathChangeCommand(std::vector<std::string> const& args)
     }
   if(!cmSystemTools::FileExists(file, true))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "RPATH_CHANGE given FILE \"" << file << "\" that does not exist.";
     this->SetError(e.str());
     return false;
@@ -2323,7 +2323,7 @@ cmFileCommand::HandleRPathChangeCommand(std::vector<std::string> const& args)
   bool changed;
   if(!cmSystemTools::ChangeRPath(file, oldRPath, newRPath, &emsg, &changed))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "RPATH_CHANGE could not write new RPATH:\n"
       << "  " << newRPath << "\n"
       << "to the file:\n"
@@ -2373,7 +2373,7 @@ cmFileCommand::HandleRPathRemoveCommand(std::vector<std::string> const& args)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "RPATH_REMOVE given unknown argument " << args[i];
       this->SetError(e.str());
       return false;
@@ -2386,7 +2386,7 @@ cmFileCommand::HandleRPathRemoveCommand(std::vector<std::string> const& args)
     }
   if(!cmSystemTools::FileExists(file, true))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "RPATH_REMOVE given FILE \"" << file << "\" that does not exist.";
     this->SetError(e.str());
     return false;
@@ -2398,7 +2398,7 @@ cmFileCommand::HandleRPathRemoveCommand(std::vector<std::string> const& args)
   bool removed;
   if(!cmSystemTools::RemoveRPath(file, &emsg, &removed))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "RPATH_REMOVE could not remove RPATH from file:\n"
       << "  " << file << "\n"
       << emsg;
@@ -2454,7 +2454,7 @@ cmFileCommand::HandleRPathCheckCommand(std::vector<std::string> const& args)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "RPATH_CHECK given unknown argument " << args[i];
       this->SetError(e.str());
       return false;
@@ -2555,7 +2555,7 @@ bool cmFileCommand::HandleRename(std::vector<std::string> const& args)
   if(!cmSystemTools::RenameFile(oldname.c_str(), newname.c_str()))
     {
     std::string err = cmSystemTools::GetLastSystemError();
-    cmOStringStream e;
+    std::ostringstream e;
     e << "RENAME failed to rename\n"
       << "  " << oldname << "\n"
       << "to\n"
@@ -2722,7 +2722,7 @@ namespace {
 
       if (updated)
         {
-        cmOStringStream oss;
+        std::ostringstream oss;
         oss << "[" << this->Text << " " << this->CurrentPercentage
             << "% complete]";
         status = oss.str();
@@ -2994,7 +2994,7 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args)
       msg += "\"";
       if(statusVar.size())
         {
-        cmOStringStream result;
+        std::ostringstream result;
         result << (int)0 << ";\"" << msg;
         this->Makefile->AddDefinition(statusVar,
                                       result.str().c_str());
@@ -3133,7 +3133,7 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args)
 
   if(statusVar.size())
     {
-    cmOStringStream result;
+    std::ostringstream result;
     result << (int)res << ";\"" << ::curl_easy_strerror(res) << "\"";
     this->Makefile->AddDefinition(statusVar,
                                   result.str().c_str());
@@ -3159,7 +3159,7 @@ cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args)
 
     if (expectedHash != actualHash)
       {
-      cmOStringStream oss;
+      std::ostringstream oss;
       oss << "DOWNLOAD HASH mismatch" << std::endl
         << "  for file: [" << file << "]" << std::endl
         << "    expected hash: [" << expectedHash << "]" << std::endl
@@ -3392,7 +3392,7 @@ cmFileCommand::HandleUploadCommand(std::vector<std::string> const& args)
 
   if(statusVar.size())
     {
-    cmOStringStream result;
+    std::ostringstream result;
     result << (int)res << ";\"" << ::curl_easy_strerror(res) << "\"";
     this->Makefile->AddDefinition(statusVar,
                                   result.str().c_str());
@@ -3568,7 +3568,7 @@ bool cmFileCommand::HandleLockCommand(
           }
         else
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << merr << ", but got:\n  \"" << args[i] << "\".";
           this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
           return false;
@@ -3601,7 +3601,7 @@ bool cmFileCommand::HandleLockCommand(
       if(!cmSystemTools::StringToLong(args[i].c_str(), &scanned)
          || scanned < 0)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "TIMEOUT value \"" << args[i] << "\" is not an unsigned integer.";
         this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
         return false;
@@ -3610,7 +3610,7 @@ bool cmFileCommand::HandleLockCommand(
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "expected DIRECTORY, RELEASE, GUARD, RESULT_VARIABLE or TIMEOUT\n";
       e << "but got: \"" << args[i] << "\".";
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -3635,7 +3635,7 @@ bool cmFileCommand::HandleLockCommand(
   std::string parentDir = cmSystemTools::GetParentDirectory(path);
   if (!cmSystemTools::MakeDirectory(parentDir))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "directory\n  \"" << parentDir << "\"\ncreation failed ";
     e << "(check permissions).";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -3645,7 +3645,7 @@ bool cmFileCommand::HandleLockCommand(
   FILE *file = cmsys::SystemTools::Fopen(path, "w");
   if (!file)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "file\n  \"" << path << "\"\ncreation failed (check permissions).";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
     cmSystemTools::SetFatalErrorOccured();
@@ -3685,7 +3685,7 @@ bool cmFileCommand::HandleLockCommand(
 
   if (resultVariable.empty() && !fileLockResult.IsOk())
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "error locking file\n  \"" << path << "\"\n" << result << ".";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
     cmSystemTools::SetFatalErrorOccured();
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 8410cda808..9386e42430 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -301,7 +301,7 @@ bool cmFindPackageCommand
       if(args[i].find_first_of(":/\\") != args[i].npos ||
          cmSystemTools::GetFilenameLastExtension(args[i]) != ".cmake")
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "given CONFIGS option followed by invalid file name \""
           << args[i] << "\".  The names given must be file names without "
           << "a path and with a \".cmake\" extension.";
@@ -317,7 +317,7 @@ bool cmFindPackageCommand
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "called with invalid argument \"" << args[i] << "\"";
       this->SetError(e.str());
       return false;
@@ -330,7 +330,7 @@ bool cmFindPackageCommand
                         std::back_inserter(doubledComponents));
   if(!doubledComponents.empty())
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "called with components that are both required and optional:\n";
     for(unsigned int i=0; i<doubledComponents.size(); ++i)
       {
@@ -345,7 +345,7 @@ bool cmFindPackageCommand
   this->UseConfigFiles = moduleArgs.empty();
   if(!this->UseFindModules && !this->UseConfigFiles)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "given options exclusive to Module mode:\n";
     for(std::set<unsigned int>::const_iterator si = moduleArgs.begin();
         si != moduleArgs.end(); ++si)
@@ -427,7 +427,7 @@ bool cmFindPackageCommand
     {
     if (this->Required)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "for module " << this->Name << " called with REQUIRED, but "
         << disableFindPackageVar
         << " is enabled. A REQUIRED package cannot be disabled.";
@@ -460,7 +460,7 @@ bool cmFindPackageCommand
   if(this->UseFindModules && this->UseConfigFiles &&
      this->Makefile->IsOn("CMAKE_FIND_PACKAGE_WARN_NO_MODULE"))
     {
-    cmOStringStream aw;
+    std::ostringstream aw;
     if(this->RequiredCMakeVersion >= CMake_VERSION_ENCODE(2,8,8))
       {
       aw << "find_package called without either MODULE or CONFIG option and "
@@ -751,8 +751,8 @@ bool cmFindPackageCommand::HandlePackageMode()
   if (result && !found && (!this->Quiet || this->Required))
     {
     // The variable is not set.
-    cmOStringStream e;
-    cmOStringStream aw;
+    std::ostringstream e;
+    std::ostringstream aw;
     if (configFileSetFOUNDFalse)
       {
       e << "Found package configuration file:\n"
@@ -1470,7 +1470,7 @@ void cmFindPackageCommand::FillPrefixesBuilds()
   // It is likely that CMake will have recently built the project.
   for(int i=0; i <= 10; ++i)
     {
-    cmOStringStream r;
+    std::ostringstream r;
     r <<
       "[HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\"
       "Settings\\StartPath;WhereBuild" << i << "]";
diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx
index 03d65907a6..8e3510d632 100644
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@@ -170,7 +170,7 @@ bool cmForEachCommand
         step == 0
         )
         {
-        cmOStringStream str;
+        std::ostringstream str;
         str << "called with incorrect range specification: start ";
         str << start << ", stop " << stop << ", step " << step;
         this->SetError(str.str());
@@ -243,7 +243,7 @@ bool cmForEachCommand::HandleInMode(std::vector<std::string> const& args)
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Unknown argument:\n" << "  " << args[i] << "\n";
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
       return true;
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 3580374aae..556ef197a2 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -103,7 +103,7 @@ bool cmFunctionHelperCommand::InvokeInitialPass
   cmMakefile::PolicyPushPop polScope(this->Makefile, true, this->Policies);
 
   // set the value of argc
-  cmOStringStream strStream;
+  std::ostringstream strStream;
   strStream << expandedArgs.size();
   this->Makefile->AddDefinition("ARGC",strStream.str().c_str());
   this->Makefile->MarkVariableAsUsed("ARGC");
@@ -111,7 +111,7 @@ bool cmFunctionHelperCommand::InvokeInitialPass
   // set the values for ARGV0 ARGV1 ...
   for (unsigned int t = 0; t < expandedArgs.size(); ++t)
     {
-    cmOStringStream tmpStream;
+    std::ostringstream tmpStream;
     tmpStream << "ARGV" << t;
     this->Makefile->AddDefinition(tmpStream.str(),
                                   expandedArgs[t].c_str());
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index 75a84cb63d..bfbe9183c7 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -106,7 +106,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
 
   if (parent && !parent->Parent)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Error evaluating generator expression:\n"
       << "  " << expr << "\n"
       << "Self reference on target \""
@@ -118,7 +118,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
     }
 
   {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Error evaluating generator expression:\n"
     << "  " << expr << "\n"
     << "Dependency loop found.";
@@ -130,7 +130,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
   int loopStep = 1;
   while (parent)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Loop step " << loopStep << "\n"
       << "  "
       << (parent->Content ? parent->Content->GetOriginalExpression() : expr)
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index 03d0bc63d4..4e2a86861a 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -51,7 +51,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(const std::string& config,
       }
     if (condResult != "1")
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Evaluation file condition \"" << rawCondition << "\" did "
           "not evaluate to valid content. Got \"" << condResult << "\".";
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -73,7 +73,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(const std::string& config,
       {
       return;
       }
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Evaluation file to be written multiple times for different "
          "configurations with different content:\n  " << outputFileName;
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -123,7 +123,7 @@ void cmGeneratorExpressionEvaluationFile::Generate()
     cmsys::ifstream fin(this->Input.c_str());
     if(!fin)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Evaluation file \"" << this->Input << "\" cannot be read.";
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 7ddf4d0592..2975c43192 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -36,7 +36,7 @@ void reportError(cmGeneratorExpressionContext *context,
     return;
     }
 
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Error evaluating generator expression:\n"
     << "  " << expr << "\n"
     << result;
@@ -456,7 +456,7 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
         {
         case cmPolicies::WARN:
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << context->Makefile->GetPolicies()
                       ->GetPolicyWarning(cmPolicies::CMP0044);
           context->Makefile->GetCMakeInstance()
@@ -953,7 +953,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
 
       if (!target)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "Target \""
           << targetName
           << "\" not found.";
@@ -1253,7 +1253,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
   {
     if (!context->EvaluateForBuildsystem)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "The evaluation of the TARGET_OBJECTS generator expression "
         "is only suitable for consumption by CMake.  It is not suitable "
         "for writing out elsewhere.";
@@ -1266,7 +1266,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
                 context->Makefile->FindGeneratorTargetToUse(tgtName);
     if (!gt)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Objects of target \"" << tgtName
         << "\" referenced but no such target exists.";
       reportError(context, content->GetOriginalExpression(), e.str());
@@ -1274,7 +1274,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
       }
     if (gt->GetType() != cmTarget::OBJECT_LIBRARY)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Objects of target \"" << tgtName
         << "\" referenced but is not an OBJECT library.";
       reportError(context, content->GetOriginalExpression(), e.str());
@@ -2028,7 +2028,7 @@ std::string GeneratorExpressionContent::EvaluateParameters(
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "$<" + identifier + "> expression requires "
         << numExpected
         << " comma separated parameters, but got "
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 2b531e27a5..cca06bb6b0 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -31,7 +31,7 @@ void reportBadObjLib(std::vector<cmSourceFile*> const& badObjLib,
 {
   if(!badObjLib.empty())
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "OBJECT library \"" << target->GetName() << "\" contains:\n";
     for(std::vector<cmSourceFile*>::const_iterator i = badObjLib.begin();
         i != badObjLib.end(); ++i)
@@ -630,7 +630,7 @@ cmTargetTraceDependencies
                           this->GlobalGenerator->GetFilenameTargetDepends(sf);
         if (tgts.find(this->Target) != tgts.end())
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << "Evaluation output file\n  \"" << sf->GetFullPath()
             << "\"\ndepends on the sources of a target it is used in.  This "
               "is a dependency loop and is not allowed.";
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 3c59c25ab1..f0b268685b 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -73,7 +73,7 @@ bool cmGetPropertyCommand
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "given invalid scope " << args[1] << ".  "
       << "Valid scopes are "
       << "GLOBAL, DIRECTORY, TARGET, SOURCE, TEST, VARIABLE, CACHE, INSTALL.";
@@ -122,7 +122,7 @@ bool cmGetPropertyCommand
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "given invalid argument \"" << args[i] << "\".";
       this->SetError(e.str());
       return false;
@@ -312,7 +312,7 @@ bool cmGetPropertyCommand::HandleTargetMode()
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "could not find TARGET " << this->Name
       << ".  Perhaps it has not yet been created.";
     this->SetError(e.str());
@@ -338,7 +338,7 @@ bool cmGetPropertyCommand::HandleSourceMode()
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "given SOURCE name that could not be found or created: "
       << this->Name;
     this->SetError(e.str());
@@ -362,7 +362,7 @@ bool cmGetPropertyCommand::HandleTestMode()
     }
 
   // If not found it is an error.
-  cmOStringStream e;
+  std::ostringstream e;
   e << "given TEST name that does not exist: " << this->Name;
   this->SetError(e.str());
   return false;
@@ -423,7 +423,7 @@ bool cmGetPropertyCommand::HandleInstallMode()
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "given INSTALL name that could not be found or created: "
       << this->Name;
     this->SetError(e.str());
diff --git a/Source/cmGetTargetPropertyCommand.cxx b/Source/cmGetTargetPropertyCommand.cxx
index aa6f0c11cc..d8f7679bd8 100644
--- a/Source/cmGetTargetPropertyCommand.cxx
+++ b/Source/cmGetTargetPropertyCommand.cxx
@@ -47,7 +47,7 @@ bool cmGetTargetPropertyCommand
   else
     {
     bool issueMessage = false;
-    cmOStringStream e;
+    std::ostringstream e;
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0045))
       {
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index dd7fbc8a49..aee96dd19e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -88,7 +88,7 @@ bool cmGlobalGenerator::SetGeneratorPlatform(std::string const& p,
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e <<
       "Generator\n"
       "  " << this->GetName() << "\n"
@@ -109,7 +109,7 @@ bool cmGlobalGenerator::SetGeneratorToolset(std::string const& ts,
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e <<
       "Generator\n"
       "  " << this->GetName() << "\n"
@@ -284,7 +284,7 @@ void cmGlobalGenerator::FindMakeProgram(cmMakefile* mf)
   if(!mf->GetDefinition("CMAKE_MAKE_PROGRAM")
      || cmSystemTools::IsOff(mf->GetDefinition("CMAKE_MAKE_PROGRAM")))
     {
-    cmOStringStream err;
+    std::ostringstream err;
     err << "CMake was unable to find a build program corresponding to \""
         << this->GetName() << "\".  CMAKE_MAKE_PROGRAM is not set.  You "
         << "probably need to select a different build tool.";
@@ -405,7 +405,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
         const char* lang = li->c_str();
         if(this->LanguagesReady.find(lang) == this->LanguagesReady.end())
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << "The test project needs language "
             << lang << " which is not enabled.";
           this->TryCompileOuterMakefile
@@ -467,7 +467,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
 #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
 # pragma warning (pop)
 #endif
-    cmOStringStream windowsVersionString;
+    std::ostringstream windowsVersionString;
     windowsVersionString << osvi.dwMajorVersion << "." << osvi.dwMinorVersion;
     windowsVersionString.str();
     mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION",
@@ -660,7 +660,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
     std::string compilerEnv = "CMAKE_";
     compilerEnv += lang;
     compilerEnv += "_COMPILER_ENV_VAR";
-    cmOStringStream noCompiler;
+    std::ostringstream noCompiler;
     const char* compilerFile = mf->GetDefinition(compilerName);
     if(!compilerFile || !*compilerFile ||
        cmSystemTools::IsNOTFOUND(compilerFile))
@@ -852,7 +852,7 @@ void cmGlobalGenerator::CheckCompilerIdCompatibility(cmMakefile* mf,
         if(!this->CMakeInstance->GetIsInTryCompile() &&
            mf->PolicyOptionalWarningEnabled("CMAKE_POLICY_WARNING_CMP0025"))
           {
-          cmOStringStream w;
+          std::ostringstream w;
           w << policies->GetPolicyWarning(cmPolicies::CMP0025) << "\n"
             "Converting " << lang <<
             " compiler id \"AppleClang\" to \"Clang\" for compatibility."
@@ -884,7 +884,7 @@ void cmGlobalGenerator::CheckCompilerIdCompatibility(cmMakefile* mf,
         if(!this->CMakeInstance->GetIsInTryCompile() &&
            mf->PolicyOptionalWarningEnabled("CMAKE_POLICY_WARNING_CMP0047"))
           {
-          cmOStringStream w;
+          std::ostringstream w;
           w << policies->GetPolicyWarning(cmPolicies::CMP0047) << "\n"
             "Converting " << lang <<
             " compiler id \"QCC\" to \"GNU\" for compatibility."
@@ -1147,7 +1147,7 @@ void cmGlobalGenerator::Configure()
 
   if ( this->CMakeInstance->GetWorkingMode() == cmake::NORMAL_MODE)
     {
-    cmOStringStream msg;
+    std::ostringstream msg;
     if(cmSystemTools::GetErrorOccuredFlag())
       {
       msg << "Configuring incomplete, errors occurred!";
@@ -1196,7 +1196,7 @@ bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const
     }
 
   // This generator does not support duplicate custom targets.
-  cmOStringStream e;
+  std::ostringstream e;
   e << "This project has enabled the ALLOW_DUPLICATE_CUSTOM_TARGETS "
     << "global property.  "
     << "The \"" << this->GetName() << "\" generator does not support "
@@ -1346,7 +1346,7 @@ void cmGlobalGenerator::Generate()
 
   if(!this->CMP0042WarnTargets.empty())
     {
-    cmOStringStream w;
+    std::ostringstream w;
     w <<
       (this->GetCMakeInstance()->GetPolicies()->
        GetPolicyWarning(cmPolicies::CMP0042)) << "\n";
@@ -2331,7 +2331,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
       cpackCommandLines.erase(cpackCommandLines.begin(),
         cpackCommandLines.end());
       depends.erase(depends.begin(), depends.end());
-      cmOStringStream ostr;
+      std::ostringstream ostr;
       if ( componentsSet->size() > 0 )
         {
         ostr << "Available install components are:";
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 6f0586b8fe..b93fbb3fe9 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -71,7 +71,7 @@ std::string cmGlobalNinjaGenerator::EncodeIdent(const std::string &ident,
   if (std::find_if(ident.begin(), ident.end(),
                    std::not1(std::ptr_fun(IsIdentChar))) != ident.end()) {
     static unsigned VarNum = 0;
-    cmOStringStream names;
+    std::ostringstream names;
     names << "ident" << VarNum++;
     vars << names.str() << " = " << ident << "\n";
     return "$" + names.str();
@@ -191,7 +191,7 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os,
   build += " " + rule;
 
   // Write the variables bound to this build statement.
-  cmOStringStream variable_assignments;
+  std::ostringstream variable_assignments;
   for(cmNinjaVars::const_iterator i = variables.begin();
       i != variables.end(); ++i)
     cmGlobalNinjaGenerator::WriteVariable(variable_assignments,
@@ -295,7 +295,7 @@ cmGlobalNinjaGenerator::AddMacOSXContentRule()
   cmLocalGenerator *lg = this->LocalGenerators[0];
   cmMakefile* mfRoot = lg->GetMakefile();
 
-  cmOStringStream cmd;
+  std::ostringstream cmd;
   cmd << lg->ConvertToOutputFormat(
            mfRoot->GetRequiredDefinition("CMAKE_COMMAND"),
            cmLocalGenerator::SHELL)
@@ -1103,7 +1103,7 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
   cmLocalGenerator *lg = this->LocalGenerators[0];
   cmMakefile* mfRoot = lg->GetMakefile();
 
-  cmOStringStream cmd;
+  std::ostringstream cmd;
   cmd << lg->ConvertToOutputFormat(
            mfRoot->GetRequiredDefinition("CMAKE_COMMAND"),
            cmLocalGenerator::SHELL)
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 3478534f71..1f086294ee 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -783,7 +783,7 @@ cmGlobalUnixMakefileGenerator3
         lg->GetMakefile()->GetHomeOutputDirectory();
       progressDir += cmake::GetCMakeFilesDirectory();
         {
-        cmOStringStream progCmd;
+        std::ostringstream progCmd;
         progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report ";
         // all target counts
         progCmd << lg->Convert(progressDir,
@@ -824,7 +824,7 @@ cmGlobalUnixMakefileGenerator3
 
       {
       // TODO: Convert the total progress count to a make variable.
-      cmOStringStream progCmd;
+      std::ostringstream progCmd;
       progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start ";
       // # in target
       progCmd << lg->Convert(progressDir,
@@ -841,7 +841,7 @@ cmGlobalUnixMakefileGenerator3
       commands.push_back(lg->GetRecursiveMakeCall
                           (tmp.c_str(),localName));
       {
-      cmOStringStream progCmd;
+      std::ostringstream progCmd;
       progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0
       progCmd << lg->Convert(progressDir,
                               cmLocalGenerator::FULL,
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 499ac56510..531a714e7e 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -156,7 +156,7 @@ cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts,
   if (this->SystemIsWindowsCE && ts.empty() &&
       this->DefaultPlatformToolset.empty())
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << this->GetName() << " Windows CE version '" << this->SystemVersion
       << "' requires CMAKE_GENERATOR_TOOLSET to be set.";
     mf->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -202,7 +202,7 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
     {
     if(this->DefaultPlatformName != "Win32")
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "CMAKE_SYSTEM_NAME is 'Android' but CMAKE_GENERATOR "
         << "specifies a platform too: '" << this->GetName() << "'";
       mf->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -231,7 +231,7 @@ bool cmGlobalVisualStudio10Generator::InitializeWindowsCE(cmMakefile* mf)
 {
   if (this->DefaultPlatformName != "Win32")
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "CMAKE_SYSTEM_NAME is 'WindowsCE' but CMAKE_GENERATOR "
       << "specifies a platform too: '" << this->GetName() << "'";
     mf->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -246,7 +246,7 @@ bool cmGlobalVisualStudio10Generator::InitializeWindowsCE(cmMakefile* mf)
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio10Generator::InitializeWindowsPhone(cmMakefile* mf)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << this->GetName() << " does not support Windows Phone.";
   mf->IssueMessage(cmake::FATAL_ERROR, e.str());
   return false;
@@ -255,7 +255,7 @@ bool cmGlobalVisualStudio10Generator::InitializeWindowsPhone(cmMakefile* mf)
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio10Generator::InitializeWindowsStore(cmMakefile* mf)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << this->GetName() << " does not support Windows Store.";
   mf->IssueMessage(cmake::FATAL_ERROR, e.str());
   return false;
@@ -320,7 +320,7 @@ void cmGlobalVisualStudio10Generator::Generate()
   if(this->LongestSource.Length > 0)
     {
     cmMakefile* mf = this->LongestSource.Target->GetMakefile();
-    cmOStringStream e;
+    std::ostringstream e;
     e <<
       "The binary and/or source directory paths may be too long to generate "
       "Visual Studio 10 files for this project.  "
@@ -574,7 +574,7 @@ bool cmGlobalVisualStudio10Generator::Find64BitTools(cmMakefile* mf)
        "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\"
        "Windows\\v7.1;InstallationFolder", winSDK_7_1))
     {
-    cmOStringStream m;
+    std::ostringstream m;
     m << "Found Windows SDK v7.1: " << winSDK_7_1;
     mf->DisplayStatus(m.str().c_str(), -1);
     this->DefaultPlatformToolset = "Windows7.1SDK";
@@ -582,7 +582,7 @@ bool cmGlobalVisualStudio10Generator::Find64BitTools(cmMakefile* mf)
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Cannot enable 64-bit tools with Visual Studio 2010 Express.\n"
       << "Install the Microsoft Windows SDK v7.1 to get 64-bit tools:\n"
       << "  http://msdn.microsoft.com/en-us/windows/bb980924.aspx";
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index 2b69222121..3013200367 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -133,7 +133,7 @@ bool cmGlobalVisualStudio11Generator::InitializeWindowsPhone(cmMakefile* mf)
 {
   if(!this->SelectWindowsPhoneToolset(this->DefaultPlatformToolset))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     if(this->DefaultPlatformToolset.empty())
       {
       e << this->GetName() << " supports Windows Phone '8.0', but not '"
@@ -156,7 +156,7 @@ bool cmGlobalVisualStudio11Generator::InitializeWindowsStore(cmMakefile* mf)
 {
   if(!this->SelectWindowsStoreToolset(this->DefaultPlatformToolset))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     if(this->DefaultPlatformToolset.empty())
       {
       e << this->GetName() << " supports Windows Store '8.0', but not '"
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx
index 047f2adef3..2bc9379acb 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -113,7 +113,7 @@ bool cmGlobalVisualStudio12Generator::InitializeWindowsPhone(cmMakefile* mf)
 {
   if(!this->SelectWindowsPhoneToolset(this->DefaultPlatformToolset))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     if(this->DefaultPlatformToolset.empty())
       {
       e << this->GetName() << " supports Windows Phone '8.0' and '8.1', but "
@@ -136,7 +136,7 @@ bool cmGlobalVisualStudio12Generator::InitializeWindowsStore(cmMakefile* mf)
 {
   if(!this->SelectWindowsStoreToolset(this->DefaultPlatformToolset))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     if(this->DefaultPlatformToolset.empty())
       {
       e << this->GetName() << " supports Windows Store '8.0' and '8.1', but "
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6a480a9c9b..8831a8b6a5 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1170,7 +1170,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
           this->CreateString("2147483647"));
         copyFilesBuildPhase->AddAttribute("dstSubfolderSpec",
           this->CreateString("6"));
-        cmOStringStream ostr;
+        std::ostringstream ostr;
         if (cmtarget.IsFrameworkOnApple())
           {
           // dstPath in frameworks is relative to Versions/<version>
@@ -1581,7 +1581,7 @@ void  cmGlobalXCodeGenerator
         }
       else
         {
-        cmOStringStream str;
+        std::ostringstream str;
         str << "_buildpart_" << count++ ;
         tname[&ccg.GetCC()] = std::string(target.GetName()) + str.str();
         makefileStream << "\\\n\t" << tname[&ccg.GetCC()];
@@ -2299,7 +2299,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
     // VERSION -> current_version
     target.GetTargetVersion(false, major, minor, patch);
-    cmOStringStream v;
+    std::ostringstream v;
 
     // Xcode always wants at least 1.0.0 or nothing
     if(!(major == 0 && minor == 0 && patch == 0))
@@ -2311,7 +2311,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
     // SOVERSION -> compatibility_version
     target.GetTargetVersion(true, major, minor, patch);
-    cmOStringStream vso;
+    std::ostringstream vso;
 
     // Xcode always wants at least 1.0.0 or nothing
     if(!(major == 0 && minor == 0 && patch == 0))
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index 601993f95e..11a5466a8e 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -497,7 +497,7 @@ int cmGraphVizWriter::CollectAllTargets()
         continue;
         }
       //std::cout << "Found target: " << tit->first.c_str() << std::endl;
-      cmOStringStream ostr;
+      std::ostringstream ostr;
       ostr << this->GraphNodePrefix << cnt++;
       this->TargetNamesNodes[realTargetName] = ostr.str();
       this->TargetPtrs[realTargetName] = &tit->second;
@@ -544,7 +544,7 @@ int cmGraphVizWriter::CollectAllExternalLibs(int cnt)
                                                 this->TargetPtrs.find(libName);
         if ( tarIt == this->TargetPtrs.end() )
           {
-          cmOStringStream ostr;
+          std::ostringstream ostr;
           ostr << this->GraphNodePrefix << cnt++;
           this->TargetNamesNodes[libName] = ostr.str();
           this->TargetPtrs[libName] = NULL;
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 0a1d28049c..9d44db1113 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -98,7 +98,7 @@ bool cmIncludeCommand
   if (gg->IsExportedTargetsFile(fname_abs))
     {
     const char *modal = 0;
-    cmOStringStream e;
+    std::ostringstream e;
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
 
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0024))
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index c3c9c55dac..c30cf85361 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -273,7 +273,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
   if(!unknownArgs.empty())
     {
     // Unknown argument.
-    cmOStringStream e;
+    std::ostringstream e;
     e << "TARGETS given unknown argument \"" << unknownArgs[0] << "\".";
     this->SetError(e.str());
     return false;
@@ -373,7 +373,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
 
     if (this->Makefile->IsAlias(*targetIt))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "TARGETS given target \"" << (*targetIt)
         << "\" which is an alias.";
       this->SetError(e.str());
@@ -390,7 +390,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
          target->GetType() != cmTarget::OBJECT_LIBRARY &&
          target->GetType() != cmTarget::INTERFACE_LIBRARY)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "TARGETS given target \"" << (*targetIt)
           << "\" which is not an executable, library, or module.";
         this->SetError(e.str());
@@ -398,7 +398,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
         }
       else if(target->GetType() == cmTarget::OBJECT_LIBRARY)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "TARGETS given OBJECT library \"" << (*targetIt)
           << "\" which may not be installed.";
         this->SetError(e.str());
@@ -410,7 +410,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
     else
       {
       // Did not find the target.
-      cmOStringStream e;
+      std::ostringstream e;
       e << "TARGETS given target \"" << (*targetIt)
         << "\" which does not exist in this directory.";
       this->SetError(e.str());
@@ -502,7 +502,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
               }
             else
               {
-              cmOStringStream e;
+              std::ostringstream e;
               e << "TARGETS given no FRAMEWORK DESTINATION for shared library "
                 "FRAMEWORK target \"" << target.GetName() << "\".";
               this->SetError(e.str());
@@ -522,7 +522,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
               }
             else
               {
-              cmOStringStream e;
+              std::ostringstream e;
               e << "TARGETS given no LIBRARY DESTINATION for shared library "
                 "target \"" << target.GetName() << "\".";
               this->SetError(e.str());
@@ -542,7 +542,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         else
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << "TARGETS given no ARCHIVE DESTINATION for static library "
             "target \"" << target.GetName() << "\".";
           this->SetError(e.str());
@@ -563,7 +563,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         else
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << "TARGETS given no LIBRARY DESTINATION for module target \""
             << target.GetName() << "\".";
           this->SetError(e.str());
@@ -598,7 +598,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
             }
           if(!bundleGenerator)
             {
-            cmOStringStream e;
+            std::ostringstream e;
             e << "TARGETS given no BUNDLE DESTINATION for MACOSX_BUNDLE "
                  "executable target \"" << target.GetName() << "\".";
             this->SetError(e.str());
@@ -615,7 +615,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
             }
           else
             {
-            cmOStringStream e;
+            std::ostringstream e;
             e << "TARGETS given no RUNTIME DESTINATION for executable "
                  "target \"" << target.GetName() << "\".";
             this->SetError(e.str());
@@ -681,7 +681,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         else
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << "INSTALL TARGETS - target " << target.GetName() << " has "
             << "PRIVATE_HEADER files but no PRIVATE_HEADER DESTINATION.";
           cmSystemTools::Message(e.str().c_str(), "Warning");
@@ -708,7 +708,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         else
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << "INSTALL TARGETS - target " << target.GetName() << " has "
             << "PUBLIC_HEADER files but no PUBLIC_HEADER DESTINATION.";
           cmSystemTools::Message(e.str().c_str(), "Warning");
@@ -734,7 +734,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         else
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << "INSTALL TARGETS - target " << target.GetName() << " has "
             << "RESOURCE files but no RESOURCE DESTINATION.";
           cmSystemTools::Message(e.str().c_str(), "Warning");
@@ -855,7 +855,7 @@ bool cmInstallCommand::HandleFilesMode(std::vector<std::string> const& args)
   if(!unknownArgs.empty())
     {
     // Unknown argument.
-    cmOStringStream e;
+    std::ostringstream e;
     e << args[0] << " given unknown argument \"" << unknownArgs[0] << "\".";
     this->SetError(e.str());
     return false;
@@ -870,7 +870,7 @@ bool cmInstallCommand::HandleFilesMode(std::vector<std::string> const& args)
   if(!ica.GetRename().empty() && files.GetVector().size() > 1)
     {
     // The rename option works only with one file.
-    cmOStringStream e;
+    std::ostringstream e;
     e << args[0] << " given RENAME option with more than one file.";
     this->SetError(e.str());
     return false;
@@ -890,7 +890,7 @@ bool cmInstallCommand::HandleFilesMode(std::vector<std::string> const& args)
   if(ica.GetDestination().empty())
     {
     // A destination is required.
-    cmOStringStream e;
+    std::ostringstream e;
     e << args[0] << " given no DESTINATION!";
     this->SetError(e.str());
     return false;
@@ -931,7 +931,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       {
       if(in_match_mode)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " does not allow \""
           << args[i] << "\" after PATTERN or REGEX.";
         this->SetError(e.str());
@@ -945,7 +945,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       {
       if(in_match_mode)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " does not allow \""
           << args[i] << "\" after PATTERN or REGEX.";
         this->SetError(e.str());
@@ -960,7 +960,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       {
       if(in_match_mode)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " does not allow \""
           << args[i] << "\" after PATTERN or REGEX.";
         this->SetError(e.str());
@@ -988,7 +988,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       // Add this property to the current match rule.
       if(!in_match_mode || doing == DoingPattern || doing == DoingRegex)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " does not allow \""
           << args[i] << "\" before a PATTERN or REGEX is given.";
         this->SetError(e.str());
@@ -1001,7 +1001,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       {
       if(!in_match_mode)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " does not allow \""
           << args[i] << "\" before a PATTERN or REGEX is given.";
         this->SetError(e.str());
@@ -1016,7 +1016,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       {
       if(in_match_mode)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " does not allow \""
           << args[i] << "\" after PATTERN or REGEX.";
         this->SetError(e.str());
@@ -1030,7 +1030,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       {
       if(in_match_mode)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " does not allow \""
           << args[i] << "\" after PATTERN or REGEX.";
         this->SetError(e.str());
@@ -1044,7 +1044,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       {
       if(in_match_mode)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " does not allow \""
           << args[i] << "\" after PATTERN or REGEX.";
         this->SetError(e.str());
@@ -1059,7 +1059,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       {
       if(in_match_mode)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " does not allow \""
           << args[i] << "\" after PATTERN or REGEX.";
         this->SetError(e.str());
@@ -1074,7 +1074,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       {
       if(in_match_mode)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " does not allow \""
           << args[i] << "\" after PATTERN or REGEX.";
         this->SetError(e.str());
@@ -1088,7 +1088,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       {
       if(in_match_mode)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " does not allow \""
           << args[i] << "\" after PATTERN or REGEX.";
         this->SetError(e.str());
@@ -1113,7 +1113,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       if(cmSystemTools::FileExists(dir.c_str()) &&
          !cmSystemTools::FileIsDirectory(dir))
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " given non-directory \""
           << args[i] << "\" to install.";
         this->SetError(e.str());
@@ -1169,7 +1169,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
      // Check the requested permission.
      if(!cmInstallCommandArguments::CheckPermissions(args[i],permissions_file))
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " given invalid file permission \""
           << args[i] << "\".";
         this->SetError(e.str());
@@ -1181,7 +1181,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       // Check the requested permission.
       if(!cmInstallCommandArguments::CheckPermissions(args[i],permissions_dir))
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " given invalid directory permission \""
           << args[i] << "\".";
         this->SetError(e.str());
@@ -1193,7 +1193,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
       // Check the requested permission.
       if(!cmInstallCommandArguments::CheckPermissions(args[i], literal_args))
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << args[0] << " given invalid permission \""
           << args[i] << "\".";
         this->SetError(e.str());
@@ -1203,7 +1203,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
     else
       {
       // Unknown argument.
-      cmOStringStream e;
+      std::ostringstream e;
       e << args[0] << " given unknown argument \"" << args[i] << "\".";
       this->SetError(e.str());
       return false;
@@ -1224,7 +1224,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
   if(!destination)
     {
     // A destination is required.
-    cmOStringStream e;
+    std::ostringstream e;
     e << args[0] << " given no DESTINATION!";
     this->SetError(e.str());
     return false;
@@ -1271,7 +1271,7 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
   if (!unknownArgs.empty())
     {
     // Unknown argument.
-    cmOStringStream e;
+    std::ostringstream e;
     e << args[0] << " given unknown argument \"" << unknownArgs[0] << "\".";
     this->SetError(e.str());
     return false;
@@ -1286,7 +1286,7 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
   if(ica.GetDestination().empty())
     {
     // A destination is required.
-    cmOStringStream e;
+    std::ostringstream e;
     e << args[0] << " given no DESTINATION!";
     this->SetError(e.str());
     return false;
@@ -1296,7 +1296,7 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
   std::string fname = filename.GetString();
   if(fname.find_first_of(":/\\") != fname.npos)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << args[0] << " given invalid export file name \"" << fname << "\".  "
       << "The FILE argument may not contain a path.  "
       << "Specify the path in the DESTINATION argument.";
@@ -1308,7 +1308,7 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
   if(!fname.empty() &&
      cmSystemTools::GetFilenameLastExtension(fname) != ".cmake")
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << args[0] << " given invalid export file name \"" << fname << "\".  "
       << "The FILE argument must specify a name ending in \".cmake\".";
     this->SetError(e.str());
@@ -1323,7 +1323,7 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
 
     if(fname.find_first_of(":/\\") != fname.npos)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << args[0] << " given export name \"" << exp.GetString() << "\".  "
         << "This name cannot be safely converted to a file name.  "
         << "Specify a different export name or use the FILE option to set "
@@ -1348,7 +1348,7 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
 
       if(!newCMP0022Behavior)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "INSTALL(EXPORT) given keyword \""
           << "EXPORT_LINK_INTERFACE_LIBRARIES" << "\", but target \""
           << te->Target->GetName()
@@ -1395,7 +1395,7 @@ bool cmInstallCommand::MakeFilesFullPath(const char* modeName,
     // Make sure the file is not a directory.
     if(gpos == file.npos && cmSystemTools::FileIsDirectory(file))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << modeName << " given directory \"" << (*fileIt) << "\" to install.";
       this->SetError(e.str());
       return false;
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index ddfd6c59c4..4480cc643a 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -121,7 +121,7 @@ void cmInstallExportGenerator::GenerateScript(std::ostream& os)
   // Skip empty sets.
   if(ExportSet->GetTargetExports()->empty())
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "INSTALL(EXPORT) given unknown export \""
       << ExportSet->GetName() << "\"";
     cmSystemTools::Error(e.str().c_str());
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index bb346fb1e2..8701b73a68 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -47,7 +47,7 @@ void cmInstallTargetGenerator::GenerateScript(std::ostream& os)
   // Warn if installing an exclude-from-all target.
   if(this->Target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
     {
-    cmOStringStream msg;
+    std::ostringstream msg;
     msg << "WARNING: Target \"" << this->Target->GetName()
         << "\" has EXCLUDE_FROM_ALL set and will not be built by default "
         << "but an install rule has been provided for it.  CMake does "
@@ -424,7 +424,7 @@ cmInstallTargetGenerator
 ::AddTweak(std::ostream& os, Indent const& indent, const std::string& config,
            std::string const& file, TweakMethod tweak)
 {
-  cmOStringStream tw;
+  std::ostringstream tw;
   (this->*tweak)(tw, indent.Next(), config, file);
   std::string tws = tw.str();
   if(!tws.empty())
@@ -450,7 +450,7 @@ cmInstallTargetGenerator
   else
     {
     // Generate a foreach loop to tweak multiple files.
-    cmOStringStream tw;
+    std::ostringstream tw;
     this->AddTweak(tw, indent.Next(), config, "${file}", tweak);
     std::string tws = tw.str();
     if(!tws.empty())
@@ -699,7 +699,7 @@ cmInstallTargetGenerator
        (!oldRuntimeDirs.empty() || !newRuntimeDirs.empty())
       )
       {
-      cmOStringStream msg;
+      std::ostringstream msg;
       msg << "WARNING: Target \"" << this->Target->GetName()
         << "\" has runtime paths which cannot be changed during install.  "
         << "To change runtime paths, OS X version 10.6 or newer is required.  "
diff --git a/Source/cmLinkDirectoriesCommand.cxx b/Source/cmLinkDirectoriesCommand.cxx
index 3644d93f23..ade1febe00 100644
--- a/Source/cmLinkDirectoriesCommand.cxx
+++ b/Source/cmLinkDirectoriesCommand.cxx
@@ -36,7 +36,7 @@ void cmLinkDirectoriesCommand::AddLinkDir(std::string const& dir)
   if(!cmSystemTools::FileIsFullPath(unixPath.c_str()))
     {
     bool convertToAbsolute = false;
-    cmOStringStream e;
+    std::ostringstream e;
     e << "This command specifies the relative path\n"
       << "  " << unixPath << "\n"
       << "as a link directory.\n";
diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index f1ea088203..47b8be5b91 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -225,7 +225,7 @@ bool cmListCommand::HandleGetCommand(std::vector<std::string> const& args)
       }
     if ( item < 0 || nitem <= (size_t)item )
       {
-      cmOStringStream str;
+      std::ostringstream str;
       str << "index: " << item << " out of range (-"
           << varArgsExpanded.size() << ", "
           << varArgsExpanded.size()-1 << ")";
@@ -322,7 +322,7 @@ bool cmListCommand::HandleInsertCommand(std::vector<std::string> const& args)
   if((!this->GetList(varArgsExpanded, listName)
       || varArgsExpanded.empty()) && item != 0)
     {
-    cmOStringStream str;
+    std::ostringstream str;
     str << "index: " << item << " out of range (0, 0)";
     this->SetError(str.str());
     return false;
@@ -337,7 +337,7 @@ bool cmListCommand::HandleInsertCommand(std::vector<std::string> const& args)
       }
     if ( item < 0 || nitem <= (size_t)item )
       {
-      cmOStringStream str;
+      std::ostringstream str;
       str << "index: " << item << " out of range (-"
         << varArgsExpanded.size() << ", "
         << (varArgsExpanded.size() == 0?0:(varArgsExpanded.size()-1)) << ")";
@@ -570,7 +570,7 @@ bool cmListCommand::HandleRemoveAtCommand(
       }
     if ( item < 0 || nitem <= (size_t)item )
       {
-      cmOStringStream str;
+      std::ostringstream str;
       str << "index: " << item << " out of range (-"
           << varArgsExpanded.size() << ", "
           << varArgsExpanded.size()-1 << ")";
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 1c395632eb..3e2634932e 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -68,7 +68,7 @@ bool cmListFileParser::ParseFile()
      bom != cmListFileLexer_BOM_UTF8)
     {
     cmListFileLexer_SetFileName(this->Lexer, 0, 0);
-    cmOStringStream m;
+    std::ostringstream m;
     m << "File\n  " << this->FileName << "\n"
       << "starts with a Byte-Order-Mark that is not UTF-8.";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, m.str());
@@ -108,7 +108,7 @@ bool cmListFileParser::ParseFile()
         }
       else
         {
-        cmOStringStream error;
+        std::ostringstream error;
         error << "Error in cmake code at\n"
               << this->FileName << ":" << token->line << ":\n"
               << "Parse error.  Expected a newline, got "
@@ -120,7 +120,7 @@ bool cmListFileParser::ParseFile()
       }
     else
       {
-      cmOStringStream error;
+      std::ostringstream error;
       error << "Error in cmake code at\n"
             << this->FileName << ":" << token->line << ":\n"
             << "Parse error.  Expected a command name, got "
@@ -268,7 +268,7 @@ bool cmListFileParser::ParseFunction(const char* name, long line)
         token->type == cmListFileLexer_Token_Space) {}
   if(!token)
     {
-    cmOStringStream error;
+    std::ostringstream error;
     error << "Error in cmake code at\n" << this->FileName << ":"
           << cmListFileLexer_GetCurrentLine(this->Lexer) << ":\n"
           << "Parse error.  Function missing opening \"(\".";
@@ -277,7 +277,7 @@ bool cmListFileParser::ParseFunction(const char* name, long line)
     }
   if(token->type != cmListFileLexer_Token_ParenLeft)
     {
-    cmOStringStream error;
+    std::ostringstream error;
     error << "Error in cmake code at\n" << this->FileName << ":"
           << cmListFileLexer_GetCurrentLine(this->Lexer) << ":\n"
           << "Parse error.  Expected \"(\", got "
@@ -355,7 +355,7 @@ bool cmListFileParser::ParseFunction(const char* name, long line)
     else
       {
       // Error.
-      cmOStringStream error;
+      std::ostringstream error;
       error << "Error in cmake code at\n" << this->FileName << ":"
             << cmListFileLexer_GetCurrentLine(this->Lexer) << ":\n"
             << "Parse error.  Function missing ending \")\".  "
@@ -367,7 +367,7 @@ bool cmListFileParser::ParseFunction(const char* name, long line)
       }
     }
 
-  cmOStringStream error;
+  std::ostringstream error;
   error << "Error in cmake code at\n"
         << this->FileName << ":" << lastLine << ":\n"
         << "Parse error.  Function missing ending \")\".  "
@@ -389,7 +389,7 @@ bool cmListFileParser::AddArgument(cmListFileLexer_Token* token,
     }
   bool isError = (this->Separation == SeparationError ||
                   delim == cmListFileArgument::Bracket);
-  cmOStringStream m;
+  std::ostringstream m;
   m << "Syntax " << (isError? "Error":"Warning") << " in cmake code at\n"
     << "  " << this->FileName << ":" << token->line << ":"
     << token->column << "\n"
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx
index a4063a680d..cdfd00c9f6 100644
--- a/Source/cmLoadCommandCommand.cxx
+++ b/Source/cmLoadCommandCommand.cxx
@@ -226,7 +226,7 @@ bool cmLoadCommandCommand
   std::string fullPath = cmSystemTools::FindFile(moduleName.c_str(), path);
   if (fullPath == "")
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Attempt to load command failed from file \""
       << moduleName << "\"";
     this->SetError(e.str());
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 2de6c93bcd..52d312e40c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -153,7 +153,7 @@ void cmLocalGenerator::ComputeObjectMaxPath()
         }
       else
         {
-        cmOStringStream w;
+        std::ostringstream w;
         w << "CMAKE_OBJECT_PATH_MAX is set to " << pmax
           << ", which is less than the minimum of 128.  "
           << "The value will be ignored.";
@@ -162,7 +162,7 @@ void cmLocalGenerator::ComputeObjectMaxPath()
       }
     else
       {
-      cmOStringStream w;
+      std::ostringstream w;
       w << "CMAKE_OBJECT_PATH_MAX is set to \"" << plen
         << "\", which fails to parse as a positive integer.  "
         << "The value will be ignored.";
@@ -191,7 +191,7 @@ void cmLocalGenerator::ReadInputFile()
 
   // The file is missing.  Check policy CMP0014.
   cmMakefile* mf = this->Parent->GetMakefile();
-  cmOStringStream e;
+  std::ostringstream e;
   e << "The source directory\n"
     << "  " << this->Makefile->GetStartDirectory() << "\n"
     << "does not contain a CMakeLists.txt file.";
@@ -1245,7 +1245,7 @@ void cmLocalGenerator::InsertRuleLauncher(std::string& s, cmTarget* target,
 {
   if(const char* val = this->GetRuleLauncher(target, prop))
     {
-    cmOStringStream wrapped;
+    std::ostringstream wrapped;
     wrapped << val << " " << s;
     s = wrapped.str();
     }
@@ -1326,7 +1326,7 @@ std::string cmLocalGenerator::GetIncludeFlags(
     }
 
   OutputFormat shellFormat = forResponseFile? RESPONSE : SHELL;
-  cmOStringStream includeFlags;
+  std::ostringstream includeFlags;
 
   std::string flagVar = "CMAKE_INCLUDE_FLAG_";
   flagVar += lang;
@@ -1521,7 +1521,7 @@ void cmLocalGenerator::AddCompileOptions(
       }
     if (this->Makefile->IsLaterStandard(it->first, standard, it->second))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "The COMPILE_FEATURES property of target \""
         << target->GetName() << "\" was evaluated when computing the link "
         "implementation, and the \"" << it->first << "_STANDARD\" was \""
@@ -1880,7 +1880,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
   OutputFormat shellFormat = (forResponseFile) ? RESPONSE :
                              ((useWatcomQuote) ? WATCOMQUOTE : SHELL);
   bool escapeAllowMakeVars = !forResponseFile;
-  cmOStringStream fout;
+  std::ostringstream fout;
   std::string config = this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
   cmComputeLinkInformation* pcli = tgt.Target->GetLinkInformation(config);
   if(!pcli)
@@ -2242,7 +2242,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
     const char *opt = target->GetMakefile()->GetDefinition(option_flag);
     if (!opt)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Target \"" << target->GetName() << "\" requires the language "
            "dialect \"" << lang << standardProp << "\" "
         << (ext ? "(with compiler extensions)" : "") << ", but CMake "
@@ -2327,7 +2327,7 @@ static void AddVisibilityCompileOption(std::string &flags, cmTarget* target,
       && strcmp(prop, "protected") != 0
       && strcmp(prop, "internal") != 0 )
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Target " << target->GetName() << " uses unsupported value \""
       << prop << "\" for " << flagDefine << ".";
     cmSystemTools::Error(e.str().c_str());
@@ -2442,7 +2442,7 @@ bool cmLocalGenerator::GetShouldUseOldFlags(bool shared,
         {
         case cmPolicies::WARN:
         {
-          cmOStringStream e;
+          std::ostringstream e;
           e << "Variable " << flagsVar << " has been modified. CMake "
             "will ignore the POSITION_INDEPENDENT_CODE target property for "
             "shared libraries and will use the " << flagsVar << " variable "
@@ -3251,7 +3251,7 @@ cmLocalGenerator
       // Warn if this is the first time the path has been seen.
       if(this->ObjectMaxPathViolations.insert(dir_max).second)
         {
-        cmOStringStream m;
+        std::ostringstream m;
         m << "The object file directory\n"
           << "  " << dir_max << "\n"
           << "has " << dir_max.size() << " characters.  "
@@ -3649,7 +3649,7 @@ bool cmLocalGenerator::CheckDefinition(std::string const& define) const
     }
   if(function_style)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "WARNING: Function-style preprocessor definitions may not be "
       << "passed on the compiler command line because many compilers "
       << "do not support it.\n"
@@ -3662,7 +3662,7 @@ bool cmLocalGenerator::CheckDefinition(std::string const& define) const
   // Many compilers do not support # in the value so we disable it.
   if(define.find_first_of("#") != define.npos)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "WARNING: Preprocessor definitions containing '#' may not be "
       << "passed on the compiler command line because many compilers "
       << "do not support it.\n"
@@ -3704,7 +3704,7 @@ void cmLocalGenerator::GenerateAppleInfoPList(cmTarget* target,
     }
   if(!cmSystemTools::FileExists(inFile.c_str(), true))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Target " << target->GetName() << " Info.plist template \""
       << inFile << "\" could not be found.";
     cmSystemTools::Error(e.str().c_str());
@@ -3748,7 +3748,7 @@ void cmLocalGenerator::GenerateFrameworkInfoPList(cmTarget* target,
     }
   if(!cmSystemTools::FileExists(inFile.c_str(), true))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Target " << target->GetName() << " Info.plist template \""
       << inFile << "\" could not be found.";
     cmSystemTools::Error(e.str().c_str());
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 0b0d9714d6..413dc0f454 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -369,7 +369,7 @@ std::string cmLocalNinjaGenerator::BuildCommandLine(
     return ":";
 #endif
 
-  cmOStringStream cmd;
+  std::ostringstream cmd;
   for (std::vector<std::string>::const_iterator li = cmdLines.begin();
        li != cmdLines.end(); ++li)
 #ifdef _WIN32
@@ -409,7 +409,7 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(
     if (wd.empty())
       wd = this->GetMakefile()->GetStartOutputDirectory();
 
-    cmOStringStream cdCmd;
+    std::ostringstream cdCmd;
 #ifdef _WIN32
         std::string cdStr = "cd /D ";
 #else
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 812ded32d7..75231b7b87 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1554,7 +1554,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
     {
     if(verbose)
       {
-      cmOStringStream msg;
+      std::ostringstream msg;
       msg << "Dependee \"" << tgtInfo
           << "\" is newer than depender \""
           << internalDependFile << "\"." << std::endl;
@@ -1577,7 +1577,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
     {
     if(verbose)
       {
-      cmOStringStream msg;
+      std::ostringstream msg;
       msg << "Dependee \"" << dirInfoFile
           << "\" is newer than depender \""
           << internalDependFile << "\"." << std::endl;
@@ -1788,7 +1788,7 @@ void cmLocalUnixMakefileGenerator3::CheckMultipleOutputs(bool verbose)
       {
       if(verbose)
         {
-        cmOStringStream msg;
+        std::ostringstream msg;
         msg << "Deleting primary custom command output \"" << dependee
             << "\" because another output \""
             << depender << "\" does not exist." << std::endl;
@@ -1918,7 +1918,7 @@ void cmLocalUnixMakefileGenerator3
   std::string progressDir = this->Makefile->GetHomeOutputDirectory();
   progressDir += cmake::GetCMakeFilesDirectory();
     {
-    cmOStringStream progCmd;
+    std::ostringstream progCmd;
     progCmd <<
       "$(CMAKE_COMMAND) -E cmake_progress_start ";
     progCmd << this->Convert(progressDir,
@@ -1942,7 +1942,7 @@ void cmLocalUnixMakefileGenerator3
                         this->Makefile->GetHomeOutputDirectory(),
                         cmLocalGenerator::START_OUTPUT);
     {
-    cmOStringStream progCmd;
+    std::ostringstream progCmd;
     progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0
     progCmd << this->Convert(progressDir,
                              cmLocalGenerator::FULL,
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index b9a507421f..1d62093783 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1321,7 +1321,7 @@ void cmLocalVisualStudio6Generator
     int major;
     int minor;
     target.GetTargetVersion(major, minor);
-    cmOStringStream targetVersionStream;
+    std::ostringstream targetVersionStream;
     targetVersionStream << "/version:" << major << "." << minor;
     targetVersionFlag = targetVersionStream.str();
     }
@@ -1998,7 +1998,7 @@ cmLocalVisualStudio6Generator
   if(define.find_first_of(" ") != define.npos &&
      define.find_first_of("\"$;") != define.npos)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "WARNING: The VS6 IDE does not support preprocessor definition "
       << "values with spaces and '\"', '$', or ';'.\n"
       << "CMake is dropping a preprocessor definition: " << define << "\n"
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 0e66764e95..914df5f2ca 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1115,7 +1115,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
 
     if(this->GetVersion() < VS8 || this->FortranProject)
       {
-      cmOStringStream libdeps;
+      std::ostringstream libdeps;
       this->Internal->OutputObjects(libdeps, &target);
       if(!libdeps.str().empty())
         {
@@ -1713,7 +1713,7 @@ bool cmLocalVisualStudio7Generator
 
   // Write the children to temporary output.
   bool hasChildrenWithSources = false;
-  cmOStringStream tmpOut;
+  std::ostringstream tmpOut;
   for(unsigned int i=0;i<children.size();++i)
     {
     if(this->WriteGroup(&children[i], target, tmpOut, libName, configs))
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index ae81c58dfb..8c2489a5ed 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -107,7 +107,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
   cmMakefile::PolicyPushPop polScope(this->Makefile, true, this->Policies);
 
   // set the value of argc
-  cmOStringStream argcDefStream;
+  std::ostringstream argcDefStream;
   argcDefStream << expandedArgs.size();
   std::string argcDef = argcDefStream.str();
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 20dae5a705..1438f7e2ba 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -363,7 +363,7 @@ cmListFileBacktrace cmMakefile::GetBacktrace() const
 //----------------------------------------------------------------------------
 void cmMakefile::PrintCommandTrace(const cmListFileFunction& lff) const
 {
-  cmOStringStream msg;
+  std::ostringstream msg;
   msg << lff.FilePath << "(" << lff.Line << "):  ";
   msg << lff.Name << "(";
   for(std::vector<cmListFileArgument>::const_iterator i =
@@ -556,7 +556,7 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
     case cmPolicies::WARN:
       // Warn because the user did not set this policy.
       {
-      cmOStringStream w;
+      std::ostringstream w;
       w << policies->GetPolicyWarning(cmPolicies::CMP0011) << "\n"
         << "The included script\n  " << this->File << "\n"
         << "affects policy settings.  "
@@ -568,7 +568,7 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
     case cmPolicies::REQUIRED_IF_USED:
     case cmPolicies::REQUIRED_ALWAYS:
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << policies->GetRequiredPolicyError(cmPolicies::CMP0011) << "\n"
         << "The included script\n  " << this->File << "\n"
         << "affects policy settings, so it requires this policy to be set.";
@@ -741,7 +741,7 @@ void cmMakefile::EnforceDirectoryLevelRules() const
   // Diagnose a violation of CMP0000 if necessary.
   if(this->CheckCMP0000)
     {
-    cmOStringStream msg;
+    std::ostringstream msg;
     msg << "No cmake_minimum_required command is present.  "
         << "A line of code such as\n"
         << "  cmake_minimum_required(VERSION "
@@ -897,7 +897,7 @@ cmMakefile::AddCustomCommandToTarget(const std::string& target,
     {
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     bool issueMessage = false;
-    cmOStringStream e;
+    std::ostringstream e;
     switch(this->GetPolicyStatus(cmPolicies::CMP0040))
       {
       case cmPolicies::WARN:
@@ -924,7 +924,7 @@ cmMakefile::AddCustomCommandToTarget(const std::string& target,
 
   if(ti->second.GetType() == cmTarget::OBJECT_LIBRARY)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Target \"" << target << "\" is an OBJECT library "
       "that may not have PRE_BUILD, PRE_LINK, or POST_BUILD commands.";
     this->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -932,7 +932,7 @@ cmMakefile::AddCustomCommandToTarget(const std::string& target,
     }
   if(ti->second.GetType() == cmTarget::INTERFACE_LIBRARY)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Target \"" << target << "\" is an INTERFACE library "
       "that may not have PRE_BUILD, PRE_LINK, or POST_BUILD commands.";
     this->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -997,7 +997,7 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs,
     cmCustomCommandLine const& cl = *i;
     if(!cl.empty() && !cl[0].empty() && cl[0][0] == '"')
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "COMMAND may not contain literal quotes:\n  " << cl[0] << "\n";
       this->IssueMessage(cmake::FATAL_ERROR, e.str());
       return 0;
@@ -1555,7 +1555,7 @@ void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
            (tgt->GetType() == cmTarget::INTERFACE_LIBRARY) ||
            tgt->IsExecutableWithExports()))
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "Target \"" << lib << "\" of type "
           << cmTarget::GetTargetTypeName(tgt->GetType())
           << " may not be linked into another target.  "
@@ -1568,7 +1568,7 @@ void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Attempt to add link library \""
       << lib << "\" to target \""
       << target << "\" which is not built in this directory.";
@@ -1584,7 +1584,7 @@ void cmMakefile::AddLinkDirectoryForTarget(const std::string& target,
     {
     if(this->IsAlias(target))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "ALIAS target \"" << target << "\" "
         << "may not be linked into another target.";
       this->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -2006,7 +2006,7 @@ void cmMakefile::CheckForUnused(const char* reason,
         !cmSystemTools::IsSubDirectory(path,
                                 cmake::GetCMakeFilesDirectory())))
       {
-      cmOStringStream msg;
+      std::ostringstream msg;
       msg << "unused variable (" << reason << ") \'" << name << "\'";
       this->GetCMakeInstance()->IssueMessage(cmake::AUTHOR_WARNING,
                                              msg.str(),
@@ -2311,7 +2311,7 @@ void cmMakefile::ExpandVariablesCMP0019()
     {
     return;
     }
-  cmOStringStream w;
+  std::ostringstream w;
 
   const char *includeDirs = this->GetProperty("INCLUDE_DIRECTORIES");
   if(mightExpandVariablesCMP0019(includeDirs))
@@ -2389,7 +2389,7 @@ void cmMakefile::ExpandVariablesCMP0019()
 
   if(!w.str().empty())
     {
-    cmOStringStream m;
+    std::ostringstream m;
     m << this->GetPolicies()->GetPolicyWarning(cmPolicies::CMP0019)
       << "\n"
       << "The following variable evaluations were encountered:\n"
@@ -2782,7 +2782,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringOld(
   else
     {
     // Construct the main error message.
-    cmOStringStream error;
+    std::ostringstream error;
     error << "Syntax error in cmake code ";
     if(filename && line > 0)
       {
@@ -2890,7 +2890,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
             case NORMAL:
               if(filename && lookup == lineVar)
                 {
-                cmOStringStream ostr;
+                std::ostringstream ostr;
                 ostr << line;
                 varresult = ostr.str();
                 }
@@ -2932,7 +2932,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
                   cmSystemTools::IsSubDirectory(filename,
                                              this->GetHomeOutputDirectory()))
                 {
-                cmOStringStream msg;
+                std::ostringstream msg;
                 cmListFileBacktrace bt(this->GetLocalGenerator());
                 cmListFileContext lfc;
                 lfc.FilePath = filename;
@@ -3126,7 +3126,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
 
   if(error)
     {
-    cmOStringStream emsg;
+    std::ostringstream emsg;
     emsg << "Syntax error in cmake code ";
     if(filename)
       {
@@ -3341,7 +3341,7 @@ void cmMakefile::PopFunctionBlockerBarrier(bool reportError)
       {
       // Report the context in which the unclosed block was opened.
       cmListFileContext const& lfc = fb->GetStartingContext();
-      cmOStringStream e;
+      std::ostringstream e;
       e << "A logical block opening on the line\n"
         << "  " << lfc << "\n"
         << "is not closed.";
@@ -3499,7 +3499,7 @@ cmMakefile::RemoveFunctionBlocker(cmFunctionBlocker* fb,
       if(!(*pos)->ShouldRemove(lff, *this))
         {
         cmListFileContext const& lfc = fb->GetStartingContext();
-        cmOStringStream e;
+        std::ostringstream e;
         e << "A logical block opening on the line\n"
           << "  " << lfc << "\n"
           << "closes on the line\n"
@@ -3559,14 +3559,14 @@ void cmMakefile::SetScriptModeFile(const char* scriptfile)
 
 void cmMakefile::SetArgcArgv(const std::vector<std::string>& args)
 {
-  cmOStringStream strStream;
+  std::ostringstream strStream;
   strStream << args.size();
   this->AddDefinition("CMAKE_ARGC", strStream.str().c_str());
   //this->MarkVariableAsUsed("CMAKE_ARGC");
 
   for (unsigned int t = 0; t < args.size(); ++t)
   {
-    cmOStringStream tmpStream;
+    std::ostringstream tmpStream;
     tmpStream << "CMAKE_ARGV" << t;
     this->AddDefinition(tmpStream.str(), args[t].c_str());
     //this->MarkVariableAsUsed(tmpStream.str().c_str());
@@ -3918,7 +3918,7 @@ std::string cmMakefile::GetModulesFile(const char* filename) const
         {
         case cmPolicies::WARN:
         {
-          cmOStringStream e;
+          std::ostringstream e;
           e << "File " << currentFile << " includes "
             << moduleInCMakeModulePath
             << " (found via CMAKE_MODULE_PATH) which shadows "
@@ -4098,7 +4098,7 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile,
     if(bom != cmsys::FStream::BOM_None &&
        bom != cmsys::FStream::BOM_UTF8)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "File starts with a Byte-Order-Mark that is not UTF-8:\n  "
         << sinfile;
       this->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -4310,7 +4310,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LINK_DIRECTORIES")
     {
-    cmOStringStream str;
+    std::ostringstream str;
     for (std::vector<std::string>::const_iterator
          it = this->GetLinkDirectories().begin();
          it != this->GetLinkDirectories().end();
@@ -4488,7 +4488,7 @@ void cmMakefile::AddCMakeDependFilesFromUser()
 
 std::string cmMakefile::GetListFileStack() const
 {
-  cmOStringStream tmp;
+  std::ostringstream tmp;
   size_t depth = this->ListFileStack.size();
   if (depth > 0)
     {
@@ -4606,7 +4606,7 @@ void cmMakefile::RaiseScope(const std::string& var, const char *varDef)
     }
   else
     {
-    cmOStringStream m;
+    std::ostringstream m;
     m << "Cannot set \"" << var << "\": current scope has no parent.";
     this->IssueMessage(cmake::AUTHOR_WARNING, m.str());
     }
@@ -4701,7 +4701,7 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
 {
   if(this->IsAlias(name))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "cannot create target \"" << name
       << "\" because an alias with the same name already exists.";
     msg = e.str();
@@ -4715,7 +4715,7 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
       {
       // Imported targets were not supported in previous versions.
       // This is new code, so we can make it an error.
-      cmOStringStream e;
+      std::ostringstream e;
       e << "cannot create target \"" << name
         << "\" because an imported target with the same name already exists.";
       msg = e.str();
@@ -4754,7 +4754,7 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
 
       // Produce an error that tells the user how to work around the
       // problem.
-      cmOStringStream e;
+      std::ostringstream e;
       e << "cannot create target \"" << name
         << "\" because another target with the same name already exists.  "
         << "The existing target is ";
@@ -4800,7 +4800,7 @@ bool cmMakefile::EnforceUniqueDir(const std::string& srcPath,
     {
     return true;
     }
-  cmOStringStream e;
+  std::ostringstream e;
   switch (this->GetPolicyStatus(cmPolicies::CMP0013))
     {
     case cmPolicies::WARN:
@@ -4985,7 +4985,7 @@ bool cmMakefile::SetPolicy(const char *id,
   cmPolicies::PolicyID pid;
   if (!this->GetPolicies()->GetPolicyID(id, /* out */ pid))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Policy \"" << id << "\" is not known to this version of CMake.";
     this->IssueMessage(cmake::FATAL_ERROR, e.str());
     return false;
@@ -5200,7 +5200,7 @@ AddRequiredTargetFeature(cmTarget *target, const std::string& feature,
                 availableFeatures.end(),
                 feature) == availableFeatures.end())
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "The compiler feature \"" << feature
       << "\" is not known to " << lang << " compiler\n\""
       << this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID")
@@ -5240,7 +5240,7 @@ CompileFeatureKnown(cmTarget const* target, const std::string& feature,
     lang = "CXX";
     return true;
     }
-  cmOStringStream e;
+  std::ostringstream e;
   if (error)
     {
     e << "specified";
@@ -5271,7 +5271,7 @@ CompileFeaturesAvailable(const std::string& lang, std::string *error) const
 
   if (!featuresKnown || !*featuresKnown)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     if (error)
       {
       e << "no";
@@ -5326,7 +5326,7 @@ HaveCFeatureAvailable(cmTarget const* target, const std::string& feature) const
   if (std::find_if(cmArrayBegin(C_STANDARDS), cmArrayEnd(C_STANDARDS),
                 cmStrCmp(existingCStandard)) == cmArrayEnd(C_STANDARDS))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "The C_STANDARD property on target \"" << target->GetName()
       << "\" contained an invalid value: \"" << existingCStandard << "\".";
     this->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -5403,7 +5403,7 @@ bool cmMakefile::HaveCxxFeatureAvailable(cmTarget const* target,
   if (std::find_if(cmArrayBegin(CXX_STANDARDS), cmArrayEnd(CXX_STANDARDS),
                 cmStrCmp(existingCxxStandard)) == cmArrayEnd(CXX_STANDARDS))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "The CXX_STANDARD property on target \"" << target->GetName()
       << "\" contained an invalid value: \"" << existingCxxStandard << "\".";
     this->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -5478,7 +5478,7 @@ AddRequiredTargetCxxFeature(cmTarget *target,
     if (std::find_if(cmArrayBegin(CXX_STANDARDS), cmArrayEnd(CXX_STANDARDS),
                   cmStrCmp(existingCxxStandard)) == cmArrayEnd(CXX_STANDARDS))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "The CXX_STANDARD property on target \"" << target->GetName()
         << "\" contained an invalid value: \"" << existingCxxStandard << "\".";
       this->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -5577,7 +5577,7 @@ AddRequiredTargetCFeature(cmTarget *target, const std::string& feature) const
     if (std::find_if(cmArrayBegin(C_STANDARDS), cmArrayEnd(C_STANDARDS),
                   cmStrCmp(existingCStandard)) == cmArrayEnd(C_STANDARDS))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "The C_STANDARD property on target \"" << target->GetName()
         << "\" contained an invalid value: \"" << existingCStandard << "\".";
       this->IssueMessage(cmake::FATAL_ERROR, e.str());
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index fc52cccf3b..d4036d29cf 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -371,8 +371,8 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   std::string targetVersionMajor;
   std::string targetVersionMinor;
   {
-  cmOStringStream majorStream;
-  cmOStringStream minorStream;
+  std::ostringstream majorStream;
+  std::ostringstream minorStream;
   int major;
   int minor;
   this->Target->GetTargetVersion(major, minor);
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 305d81d7b7..cdda36c52c 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -566,8 +566,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::string targetVersionMajor;
   std::string targetVersionMinor;
   {
-  cmOStringStream majorStream;
-  cmOStringStream minorStream;
+  std::ostringstream majorStream;
+  std::ostringstream minorStream;
   int major;
   int minor;
   this->Target->GetTargetVersion(major, minor);
@@ -805,7 +805,7 @@ cmMakefileLibraryTargetGenerator
   if(major > 0 || minor > 0 || patch > 0)
     {
     // Append the flag since a non-zero version is specified.
-    cmOStringStream vflag;
+    std::ostringstream vflag;
     vflag << flag << major << "." << minor << "." << patch;
     this->LocalGenerator->AppendFlags(flags, vflag.str());
     }
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index cbf8573a60..ef08c21c0d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -451,7 +451,7 @@ void cmMakefileTargetGenerator
     }
   else
     {
-    cmOStringStream err;
+    std::ostringstream err;
     err << "Warning: Source file \""
         << source.GetFullPath()
         << "\" is listed multiple times for target \""
@@ -1101,7 +1101,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
 
   // Add a command to call CMake to scan dependencies.  CMake will
   // touch the corresponding depends file after scanning dependencies.
-  cmOStringStream depCmd;
+  std::ostringstream depCmd;
   // TODO: Account for source file properties and directory-level
   // definitions when scanning for dependencies.
 #if !defined(_WIN32) || defined(__CYGWIN__)
@@ -1217,7 +1217,7 @@ void cmMakefileTargetGenerator
     }
 
   // Now append the actual user-specified commands.
-  cmOStringStream content;
+  std::ostringstream content;
   this->LocalGenerator->AppendCustomCommand(commands, ccg, this->Target, false,
                                             cmLocalGenerator::HOME_OUTPUT,
                                             &content);
@@ -1279,7 +1279,7 @@ cmMakefileTargetGenerator::AppendProgress(std::vector<std::string>& commands)
     }
   std::string progressDir = this->Makefile->GetHomeOutputDirectory();
   progressDir += cmake::GetCMakeFilesDirectory();
-  cmOStringStream progCmd;
+  std::ostringstream progCmd;
   progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report ";
   progCmd << this->LocalGenerator->Convert(progressDir,
                                            cmLocalGenerator::FULL,
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 53b7a8e18c..32a5ccf5f3 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -218,8 +218,8 @@ cmNinjaNormalTargetGenerator
     std::string targetVersionMajor;
     std::string targetVersionMinor;
     {
-    cmOStringStream majorStream;
-    cmOStringStream minorStream;
+    std::ostringstream majorStream;
+    std::ostringstream minorStream;
     int major;
     int minor;
     this->GetTarget()->GetTargetVersion(major, minor);
@@ -255,10 +255,10 @@ cmNinjaNormalTargetGenerator
       this->GetLocalGenerator()->BuildCommandLine(linkCmds);
 
     // Write the linker rule with response file if needed.
-    cmOStringStream comment;
+    std::ostringstream comment;
     comment << "Rule for linking " << this->TargetLinkLanguage << " "
             << this->GetVisibleTypeName() << ".";
-    cmOStringStream description;
+    std::ostringstream description;
     description << "Linking " << this->TargetLinkLanguage << " "
                 << this->GetVisibleTypeName() << " $TARGET_FILE";
     this->GetGlobalGenerator()->AddRule(ruleName,
@@ -435,7 +435,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   cmNinjaVars vars;
 
   // Compute the comment.
-  cmOStringStream comment;
+  std::ostringstream comment;
   comment <<
     "Link the " << this->GetVisibleTypeName() << " " << targetOutputReal;
 
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index b36ff93fef..c019ceb48d 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -468,9 +468,9 @@ cmNinjaTargetGenerator
 
 
   // Write the rule for compiling file of the given language.
-  cmOStringStream comment;
+  std::ostringstream comment;
   comment << "Rule for compiling " << lang << " files.";
-  cmOStringStream description;
+  std::ostringstream description;
   description << "Building " << lang << " object $out";
   this->GetGlobalGenerator()->AddRule(this->LanguageCompilerRule(lang),
                                       cmdLine,
diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx
index 3cdd2f68df..116d42fcec 100644
--- a/Source/cmOrderDirectories.cxx
+++ b/Source/cmOrderDirectories.cxx
@@ -86,7 +86,7 @@ public:
       }
     }
 
-  void FindImplicitConflicts(cmOStringStream& w)
+  void FindImplicitConflicts(std::ostringstream& w)
     {
     bool first = true;
     for(unsigned int i=0; i < this->OD->OriginalDirectories.size(); ++i)
@@ -541,7 +541,7 @@ void cmOrderDirectories::FindImplicitConflicts()
 {
   // Check for items in implicit link directories that have conflicts
   // in the explicit directories.
-  cmOStringStream conflicts;
+  std::ostringstream conflicts;
   for(unsigned int i=0; i < this->ImplicitDirEntries.size(); ++i)
     {
     this->ImplicitDirEntries[i]->FindImplicitConflicts(conflicts);
@@ -555,7 +555,7 @@ void cmOrderDirectories::FindImplicitConflicts()
     }
 
   // Warn about the conflicts.
-  cmOStringStream w;
+  std::ostringstream w;
   w << "Cannot generate a safe " << this->Purpose
     << " for target " << this->Target->GetName()
     << " because files in some directories may conflict with "
@@ -624,7 +624,7 @@ void cmOrderDirectories::DiagnoseCycle()
   this->CycleDiagnosed = true;
 
   // Construct the message.
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Cannot generate a safe " << this->Purpose
     << " for target " << this->Target->GetName()
     << " because there is a cycle in the constraint graph:\n";
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 1a27a25f5f..da64617ef6 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -41,7 +41,7 @@ public:
 
   std::string GetVersionString()
   {
-    cmOStringStream v;
+    std::ostringstream v;
     v << this->MajorVersionIntroduced << "." << this->MinorVersionIntroduced;
     if(this->PatchVersionIntroduced > 0)
       {
@@ -432,7 +432,7 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
   if(sscanf(ver.c_str(), "%u.%u.%u.%u",
             &majorVer, &minorVer, &patchVer, &tweakVer) < 2)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Invalid policy version value \"" << ver << "\".  "
       << "A numeric major.minor[.patch[.tweak]] must be given.";
     mf->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -462,7 +462,7 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
        patchVer == cmVersion::GetPatchVersion() &&
        tweakVer > cmVersion::GetTweakVersion()))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "An attempt was made to set the policy version of CMake to \""
       << version << "\" which is greater than this version of CMake.  "
       << "This is not allowed because the greater version may have new "
@@ -534,7 +534,7 @@ bool cmPolicies::GetPolicyDefault(cmMakefile* mf, std::string const& policy,
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << defaultVar << " has value \"" << defaultValue
       << "\" but must be \"OLD\", \"NEW\", or \"\" (empty).";
     mf->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -584,7 +584,7 @@ std::string cmPolicies::GetPolicyWarning(cmPolicies::PolicyID id)
     return "Request for warning text for undefined policy!";
     }
 
-  cmOStringStream msg;
+  std::ostringstream msg;
   msg <<
     "Policy " << pos->second->IDString << " is not set: "
     "" << pos->second->ShortDescription << "  "
@@ -608,7 +608,7 @@ std::string cmPolicies::GetRequiredPolicyError(cmPolicies::PolicyID id)
     return "Request for error text for undefined policy!";
     }
 
-  cmOStringStream error;
+  std::ostringstream error;
   error <<
     "Policy " << pos->second->IDString << " is not set to NEW: "
     "" << pos->second->ShortDescription << "  "
@@ -645,7 +645,7 @@ std::string
 cmPolicies::GetRequiredAlwaysPolicyError(cmPolicies::PolicyID id)
 {
   std::string pid = this->GetPolicyIDString(id);
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Policy " << pid << " may not be set to OLD behavior because this "
     << "version of CMake no longer supports it.  "
     << "The policy was introduced in "
@@ -667,7 +667,7 @@ cmPolicies::DiagnoseAncientPolicies(std::vector<PolicyID> const& ancient,
                                     unsigned int patchVer,
                                     cmMakefile* mf)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "The project requests behavior compatible with CMake version \""
     << majorVer << "." << minorVer << "." << patchVer
     << "\", which requires the OLD behavior for some policies:\n";
diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx
index 12318c8afa..61c0133c4c 100644
--- a/Source/cmProjectCommand.cxx
+++ b/Source/cmProjectCommand.cxx
@@ -215,7 +215,7 @@ bool cmProjectCommand
       }
     if(!vw.empty())
       {
-      cmOStringStream w;
+      std::ostringstream w;
       w << (this->Makefile->GetPolicies()
             ->GetPolicyWarning(cmPolicies::CMP0048))
         << "\nThe following variable(s) would be set to empty:" << vw;
diff --git a/Source/cmSeparateArgumentsCommand.cxx b/Source/cmSeparateArgumentsCommand.cxx
index 1ee3f29f54..8e6c311419 100644
--- a/Source/cmSeparateArgumentsCommand.cxx
+++ b/Source/cmSeparateArgumentsCommand.cxx
@@ -51,7 +51,7 @@ bool cmSeparateArgumentsCommand
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "given unknown argument " << args[i];
       this->SetError(e.str());
       return false;
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index 653d7645c5..1150bc7ad8 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -67,7 +67,7 @@ bool cmSetPropertyCommand
     }
   else
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "given invalid scope " << *arg << ".  "
       << "Valid scopes are GLOBAL, DIRECTORY, "
         "TARGET, SOURCE, TEST, CACHE, INSTALL.";
@@ -117,7 +117,7 @@ bool cmSetPropertyCommand
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "given invalid argument \"" << *arg << "\".";
       this->SetError(e.str());
       return false;
@@ -265,7 +265,7 @@ bool cmSetPropertyCommand::HandleTargetMode()
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "could not find TARGET " << *ni
         << ".  Perhaps it has not yet been created.";
       this->SetError(e.str());
@@ -316,7 +316,7 @@ bool cmSetPropertyCommand::HandleSourceMode()
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "given SOURCE name that could not be found or created: " << *ni;
       this->SetError(e.str());
       return false;
@@ -373,7 +373,7 @@ bool cmSetPropertyCommand::HandleTestMode()
   // Names that are still left were not found.
   if(!this->Names.empty())
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "given TEST names that do not exist:\n";
     for(std::set<std::string>::const_iterator ni = this->Names.begin();
         ni != this->Names.end(); ++ni)
@@ -417,7 +417,7 @@ bool cmSetPropertyCommand::HandleCacheMode()
        !cmSystemTools::IsOn(this->PropertyValue.c_str()) &&
        !cmSystemTools::IsOff(this->PropertyValue.c_str()))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "given non-boolean value \"" << this->PropertyValue
         << "\" for CACHE property \"ADVANCED\".  ";
       this->SetError(e.str());
@@ -428,7 +428,7 @@ bool cmSetPropertyCommand::HandleCacheMode()
     {
     if(!cmCacheManager::IsType(this->PropertyValue.c_str()))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "given invalid CACHE entry TYPE \"" << this->PropertyValue << "\"";
       this->SetError(e.str());
       return false;
@@ -438,7 +438,7 @@ bool cmSetPropertyCommand::HandleCacheMode()
           this->PropertyName != "STRINGS" &&
           this->PropertyName != "VALUE")
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "given invalid CACHE property " << this->PropertyName << ".  "
       << "Settable CACHE properties are: "
       << "ADVANCED, HELPSTRING, STRINGS, TYPE, and VALUE.";
@@ -463,7 +463,7 @@ bool cmSetPropertyCommand::HandleCacheMode()
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "could not find CACHE variable " << *ni
         << ".  Perhaps it has not yet been created.";
       this->SetError(e.str());
@@ -513,7 +513,7 @@ bool cmSetPropertyCommand::HandleInstallMode()
       }
     else
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "given INSTALL name that could not be found or created: " << *i;
       this->SetError(e.str());
       return false;
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx
index 6fe5c62952..27fda40f7e 100644
--- a/Source/cmSourceFile.cxx
+++ b/Source/cmSourceFile.cxx
@@ -202,7 +202,7 @@ bool cmSourceFile::FindFullPath(std::string* error)
       }
     }
 
-  cmOStringStream e;
+  std::ostringstream e;
   std::string missing = this->Location.GetDirectory();
   if(!missing.empty())
     {
diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index edba5baf86..1741e05a13 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -90,7 +90,7 @@ bool cmSourceGroupCommand
       }
     else
       {
-      cmOStringStream err;
+      std::ostringstream err;
       err << "Unknown argument \"" << args[i] << "\".  "
           << "Perhaps the FILES keyword is missing.\n";
       this->SetError(err.str());
diff --git a/Source/cmStandardIncludes.cxx b/Source/cmStandardIncludes.cxx
index a4bdb2e32c..23c570c034 100644
--- a/Source/cmStandardIncludes.cxx
+++ b/Source/cmStandardIncludes.cxx
@@ -11,6 +11,6 @@
 ============================================================================*/
 #include "cmStandardIncludes.h"
 #if !defined(CMAKE_NO_ANSI_STRING_STREAM)
-cmOStringStream::cmOStringStream() {}
-cmOStringStream::~cmOStringStream() {}
+std::ostringstream::cmOStringStream() {}
+std::ostringstream::~cmOStringStream() {}
 #endif
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index df031b9cde..a7db271242 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -140,7 +140,7 @@ private:
 #endif
 
 /* Poison this operator to avoid common mistakes.  */
-extern void operator << (std::ostream&, const cmOStringStream&);
+extern void operator << (std::ostream&, const std::ostringstream&);
 
 /** Standard documentation entry for cmDocumentation's formatting.  */
 struct cmDocumentationEntry
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 834102748f..fe962bafdc 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -122,7 +122,7 @@ bool cmStringCommand::HandleHashCommand(std::vector<std::string> const& args)
 #if defined(CMAKE_BUILD_WITH_CMAKE)
   if(args.size() != 3)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << args[0] << " requires an output variable and an input string";
     this->SetError(e.str());
     return false;
@@ -137,7 +137,7 @@ bool cmStringCommand::HandleHashCommand(std::vector<std::string> const& args)
     }
   return false;
 #else
-  cmOStringStream e;
+  std::ostringstream e;
   e << args[0] << " not available during bootstrap";
   this->SetError(e.str().c_str());
   return false;
@@ -233,7 +233,7 @@ bool cmStringCommand::HandleConfigureCommand(
       }
     else
       {
-      cmOStringStream err;
+      std::ostringstream err;
       err << "Unrecognized argument \"" << args[i] << "\"";
       this->SetError(err.str());
       return false;
@@ -591,7 +591,7 @@ bool cmStringCommand::HandleFindCommand(std::vector<std::string> const&
     }
   if(std::string::npos != pos)
     {
-    cmOStringStream s;
+    std::ostringstream s;
     s << pos;
     this->Makefile->AddDefinition(outvar, s.str().c_str());
     return true;
@@ -705,7 +705,7 @@ bool cmStringCommand::HandleSubstringCommand(std::vector<std::string> const&
   int intStringLength = static_cast<int>(stringLength);
   if ( begin < 0 || begin > intStringLength )
     {
-    cmOStringStream ostr;
+    std::ostringstream ostr;
     ostr << "begin index: " << begin << " is out of range 0 - "
          << stringLength;
     this->SetError(ostr.str());
@@ -713,7 +713,7 @@ bool cmStringCommand::HandleSubstringCommand(std::vector<std::string> const&
     }
   if ( end < -1 )
     {
-    cmOStringStream ostr;
+    std::ostringstream ostr;
     ostr << "end index: " << end << " should be -1 or greater";
     this->SetError(ostr.str());
     return false;
@@ -1089,7 +1089,7 @@ bool cmStringCommand
   this->Makefile->AddDefinition(outputVariable, uuid.c_str());
   return true;
 #else
-  cmOStringStream e;
+  std::ostringstream e;
   e << args[0] << " not available during bootstrap";
   this->SetError(e.str().c_str());
   return false;
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 1d36ff5b55..16e71cc790 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2501,7 +2501,7 @@ bool cmSystemTools::ChangeRPath(std::string const& file,
         }
       if(emsg)
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "The current " << se_name[i] << " is:\n"
           << "  " << se[i]->Value << "\n"
           << "which does not contain:\n"
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 94a6de32cd..5d68d9d932 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -686,7 +686,7 @@ static bool processSources(cmTarget const* tgt,
 
       if (!targetName.empty() && !cmSystemTools::FileIsFullPath(src.c_str()))
         {
-        cmOStringStream err;
+        std::ostringstream err;
         if (!targetName.empty())
           {
           err << "Target \"" << targetName << "\" contains relative "
@@ -863,7 +863,7 @@ cmTarget::GetConfigCommonSourceFiles(std::vector<cmSourceFile*>& files) const
         thisConfigFiles += (*fi)->GetFullPath();
         sep = "\n  ";
         }
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Target \"" << this->Name << "\" has source files which vary by "
         "configuration. This is not supported by the \""
         << this->Makefile->GetLocalGenerator()
@@ -996,7 +996,7 @@ std::string cmTarget::ProcessSourceItemCMP0049(const std::string& s)
   this->Makefile->ExpandVariablesInString(src);
   if (src != s)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     bool noMessage = false;
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0049))
@@ -1279,7 +1279,7 @@ bool cmTarget::PushTLLCommandTrace(TLLSignature signature)
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::GetTllSignatureTraces(cmOStringStream &s,
+void cmTarget::GetTllSignatureTraces(std::ostringstream &s,
                                      TLLSignature sig) const
 {
   std::vector<cmListFileBacktrace> sigs;
@@ -1307,7 +1307,7 @@ void cmTarget::GetTllSignatureTraces(cmOStringStream &s,
       if(i != it->end())
         {
         cmListFileContext const& lfc = *i;
-        cmOStringStream line;
+        std::ostringstream line;
         line << " * " << (lfc.Line? "": " in ") << lfc << std::endl;
         if (emitted.insert(line.str()).second)
           {
@@ -1749,7 +1749,7 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
   if (this->GetType() == INTERFACE_LIBRARY
       && !whiteListedInterfaceProperty(prop))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "INTERFACE_LIBRARY targets may only have whitelisted properties.  "
          "The property \"" << prop << "\" is not allowed.";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -1757,7 +1757,7 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
     }
   else if (prop == "NAME")
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "NAME property is read-only\n";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
@@ -1800,7 +1800,7 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
     }
   else if(prop == "EXPORT_NAME" && this->IsImported())
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "EXPORT_NAME property can't be set on imported targets (\""
           << this->Name << "\")\n";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -1816,7 +1816,7 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
     {
     if(this->IsImported())
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "SOURCES property can't be set on imported targets (\""
             << this->Name << "\")\n";
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -1844,7 +1844,7 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
   if (this->GetType() == INTERFACE_LIBRARY
       && !whiteListedInterfaceProperty(prop))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "INTERFACE_LIBRARY targets may only have whitelisted properties.  "
          "The property \"" << prop << "\" is not allowed.";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -1852,7 +1852,7 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
     }
   else if (prop == "NAME")
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "NAME property is read-only\n";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
@@ -1887,7 +1887,7 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
     }
   else if(prop == "EXPORT_NAME" && this->IsImported())
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "EXPORT_NAME property can't be set on imported targets (\""
           << this->Name << "\")\n";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -1902,7 +1902,7 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
     {
     if(this->IsImported())
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "SOURCES property can't be set on imported targets (\""
             << this->Name << "\")\n";
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -1931,7 +1931,7 @@ std::string cmTarget::GetExportName() const
     {
     if (!cmGeneratorExpression::IsValidTargetName(exportName))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "EXPORT_NAME property \"" << exportName << "\" for \""
         << this->GetName() << "\": is not valid.";
       cmSystemTools::Error(e.str().c_str());
@@ -2043,7 +2043,7 @@ static void processIncludeDirectories(cmTarget const* tgt,
       if (fromImported
           && !cmSystemTools::FileExists(li->c_str()))
         {
-        cmOStringStream e;
+        std::ostringstream e;
         cmake::MessageType messageType = cmake::FATAL_ERROR;
         if (checkCMP0027)
           {
@@ -2076,7 +2076,7 @@ static void processIncludeDirectories(cmTarget const* tgt,
 
       if (!cmSystemTools::FileIsFullPath(li->c_str()))
         {
-        cmOStringStream e;
+        std::ostringstream e;
         bool noMessage = false;
         cmake::MessageType messageType = cmake::FATAL_ERROR;
         if (!targetName.empty())
@@ -2426,7 +2426,7 @@ void cmTarget::GetCompileDefinitions(std::vector<std::string> &list,
         {
         case cmPolicies::WARN:
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << this->Makefile->GetCMakeInstance()->GetPolicies()
                    ->GetPolicyWarning(cmPolicies::CMP0043);
           this->Makefile->IssueMessage(cmake::AUTHOR_WARNING,
@@ -2559,7 +2559,7 @@ static void cmTargetCheckLINK_INTERFACE_LIBRARIES(
                       "LINK_INTERFACE_LIBRARIES");
 
   // Report an error.
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Property " << prop << " may not contain link-type keyword \""
     << keys.match(2) << "\".  "
     << "The " << base << " property has a per-configuration "
@@ -2596,7 +2596,7 @@ static void cmTargetCheckINTERFACE_LINK_LIBRARIES(const char* value,
     }
 
   // Report an error.
-  cmOStringStream e;
+  std::ostringstream e;
 
   e << "Property INTERFACE_LINK_LIBRARIES may not contain link-type "
     "keyword \"" << keys.match(2) << "\".  The INTERFACE_LINK_LIBRARIES "
@@ -2895,7 +2895,7 @@ bool cmTarget::HandleLocationPropertyPolicy(cmMakefile* context) const
     {
     return true;
     }
-  cmOStringStream e;
+  std::ostringstream e;
   const char *modal = 0;
   cmake::MessageType messageType = cmake::AUTHOR_WARNING;
   switch (context->GetPolicyStatus(cmPolicies::CMP0026))
@@ -2954,7 +2954,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
   if (this->GetType() == INTERFACE_LIBRARY
       && !whiteListedInterfaceProperty(prop))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "INTERFACE_LIBRARY targets may only have whitelisted properties.  "
          "The property \"" << prop << "\" is not allowed.";
     context->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -3130,7 +3130,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
         return 0;
         }
 
-      cmOStringStream ss;
+      std::ostringstream ss;
       const char* sep = "";
       typedef cmTargetInternals::TargetPropertyEntry
                                   TargetPropertyEntry;
@@ -3160,7 +3160,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
 
             bool addContent = false;
             bool noMessage = true;
-            cmOStringStream e;
+            std::ostringstream e;
             cmake::MessageType messageType = cmake::AUTHOR_WARNING;
             switch(context->GetPolicyStatus(cmPolicies::CMP0051))
               {
@@ -3258,7 +3258,7 @@ public:
         {
         bool noMessage = false;
         cmake::MessageType messageType = cmake::FATAL_ERROR;
-        cmOStringStream e;
+        std::ostringstream e;
         switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0028))
           {
           case cmPolicies::WARN:
@@ -3379,7 +3379,7 @@ public:
       }
     else if(this->Preferred.size() > 1)
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Target " << this->Target->GetName()
         << " contains multiple languages with the highest linker preference"
         << " (" << this->Preference << "):\n";
@@ -3751,7 +3751,7 @@ bool cmTarget::HasMacOSXRpathInstallNameDir(const std::string& config) const
 
   if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
     {
-    cmOStringStream w;
+    std::ostringstream w;
     w << "Attempting to use";
     if(macosx_rpath)
       {
@@ -5049,7 +5049,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
         report += compatibilityAgree(t, propContent != consistent.second);
         if (!consistent.first)
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << "Property " << p << " on target \""
             << tgt->GetName() << "\" does\nnot match the "
             "INTERFACE_" << p << " property requirement\nof "
@@ -5082,7 +5082,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
         report += compatibilityAgree(t, propContent != consistent.second);
         if (!consistent.first)
           {
-          cmOStringStream e;
+          std::ostringstream e;
           e << "Property " << p << " on target \""
             << tgt->GetName() << "\" is\nimplied to be " << defaultValue
             << " because it was used to determine the link libraries\n"
@@ -5116,7 +5116,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
           report += compatibilityAgree(t, propContent != consistent.second);
           if (!consistent.first)
             {
-            cmOStringStream e;
+            std::ostringstream e;
             e << "The INTERFACE_" << p << " property of \""
               << theTarget->GetName() << "\" does\nnot agree with the value "
                 "of " << p << " already determined\nfor \""
@@ -6024,7 +6024,7 @@ cmTargetInternals::ComputeLinkInterfaceLibraries(
     if (newExplicitLibraries
         && strcmp(newExplicitLibraries, explicitLibraries) != 0)
       {
-      cmOStringStream w;
+      std::ostringstream w;
       w <<
         (thisTarget->Makefile->GetPolicies()
          ->GetPolicyWarning(cmPolicies::CMP0022)) << "\n"
@@ -6111,7 +6111,7 @@ cmTargetInternals::ComputeLinkInterfaceLibraries(
         if(newLibraries.empty())
           { newLibraries = "(empty)"; }
 
-        cmOStringStream w;
+        std::ostringstream w;
         w <<
           (thisTarget->Makefile->GetPolicies()
            ->GetPolicyWarning(cmPolicies::CMP0022)) << "\n"
@@ -6366,7 +6366,7 @@ cmTargetInternals::ComputeLinkImplementationLibraries(
           {
           bool noMessage = false;
           cmake::MessageType messageType = cmake::FATAL_ERROR;
-          cmOStringStream e;
+          std::ostringstream e;
           switch(thisTarget->GetPolicyStatusCMP0038())
             {
             case cmPolicies::WARN:
@@ -6472,7 +6472,7 @@ cmTarget const* cmTarget::FindTargetToLink(std::string const& name) const
 
   if(tgt && tgt->GetType() == cmTarget::OBJECT_LIBRARY)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Target \"" << this->GetName() << "\" links to "
       "OBJECT library \"" << tgt->GetName() << "\" but this is not "
       "allowed.  "
@@ -6511,7 +6511,7 @@ std::string cmTarget::CheckCMP0004(std::string const& item) const
       {
       case cmPolicies::WARN:
         {
-        cmOStringStream w;
+        std::ostringstream w;
         w << (this->Makefile->GetPolicies()
               ->GetPolicyWarning(cmPolicies::CMP0004)) << "\n"
           << "Target \"" << this->GetName() << "\" links to item \""
@@ -6523,7 +6523,7 @@ std::string cmTarget::CheckCMP0004(std::string const& item) const
         break;
       case cmPolicies::NEW:
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << "Target \"" << this->GetName() << "\" links to item \""
           << item << "\" which has leading or trailing whitespace.  "
           << "This is now an error according to policy CMP0004.";
@@ -6533,7 +6533,7 @@ std::string cmTarget::CheckCMP0004(std::string const& item) const
       case cmPolicies::REQUIRED_IF_USED:
       case cmPolicies::REQUIRED_ALWAYS:
         {
-        cmOStringStream e;
+        std::ostringstream e;
         e << (this->Makefile->GetPolicies()
               ->GetRequiredPolicyError(cmPolicies::CMP0004)) << "\n"
           << "Target \"" << this->GetName() << "\" links to item \""
@@ -6614,7 +6614,7 @@ void checkPropertyConsistency(cmTarget const* depender,
     std::string pfile = pdir + pname + ".rst";
     if(cmSystemTools::FileExists(pfile.c_str(), true))
       {
-      cmOStringStream e;
+      std::ostringstream e;
       e << "Target \"" << dependee->GetName() << "\" has property \""
         << *pi << "\" listed in its " << propName << " property.  "
           "This is not allowed.  Only user-defined properties may appear "
@@ -6776,7 +6776,7 @@ void cmTarget::CheckPropertyCompatibility(cmComputeLinkInformation *info,
      {
      propsString += " and the " + *props.begin();
      }
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Property \"" << prop << "\" appears in both the "
       << propsString <<
     " property in the dependencies of target \"" << this->GetName() <<
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index a3ecca0601..ddd985973e 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -202,7 +202,7 @@ public:
     PlainTLLSignature
   };
   bool PushTLLCommandTrace(TLLSignature signature);
-  void GetTllSignatureTraces(cmOStringStream &s, TLLSignature sig) const;
+  void GetTllSignatureTraces(std::ostringstream &s, TLLSignature sig) const;
 
   void MergeLinkLibraries( cmMakefile& mf, const std::string& selfname,
                            const LinkLibraryVectorType& libs );
diff --git a/Source/cmTargetCompileDefinitionsCommand.cxx b/Source/cmTargetCompileDefinitionsCommand.cxx
index 66d8ad34a3..dc19720cb8 100644
--- a/Source/cmTargetCompileDefinitionsCommand.cxx
+++ b/Source/cmTargetCompileDefinitionsCommand.cxx
@@ -20,7 +20,7 @@ bool cmTargetCompileDefinitionsCommand
 void cmTargetCompileDefinitionsCommand
 ::HandleImportedTarget(const std::string &tgt)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Cannot specify compile definitions for imported target \""
     << tgt << "\".";
   this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -29,7 +29,7 @@ void cmTargetCompileDefinitionsCommand
 void cmTargetCompileDefinitionsCommand
 ::HandleMissingTarget(const std::string &name)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Cannot specify compile definitions for target \"" << name << "\" "
        "which is not built by this project.";
   this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
diff --git a/Source/cmTargetCompileFeaturesCommand.cxx b/Source/cmTargetCompileFeaturesCommand.cxx
index 10daad4648..15a9a3802c 100644
--- a/Source/cmTargetCompileFeaturesCommand.cxx
+++ b/Source/cmTargetCompileFeaturesCommand.cxx
@@ -21,7 +21,7 @@ bool cmTargetCompileFeaturesCommand::InitialPass(
 void cmTargetCompileFeaturesCommand
 ::HandleImportedTarget(const std::string &tgt)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Cannot specify compile features for imported target \""
     << tgt << "\".";
   this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -30,7 +30,7 @@ void cmTargetCompileFeaturesCommand
 void cmTargetCompileFeaturesCommand
 ::HandleMissingTarget(const std::string &name)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Cannot specify compile features for target \"" << name << "\" "
        "which is not built by this project.";
   this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
diff --git a/Source/cmTargetCompileOptionsCommand.cxx b/Source/cmTargetCompileOptionsCommand.cxx
index 3fb76a6ddd..e16468bf77 100644
--- a/Source/cmTargetCompileOptionsCommand.cxx
+++ b/Source/cmTargetCompileOptionsCommand.cxx
@@ -20,7 +20,7 @@ bool cmTargetCompileOptionsCommand
 void cmTargetCompileOptionsCommand
 ::HandleImportedTarget(const std::string &tgt)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Cannot specify compile options for imported target \""
     << tgt << "\".";
   this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -29,7 +29,7 @@ void cmTargetCompileOptionsCommand
 void cmTargetCompileOptionsCommand
 ::HandleMissingTarget(const std::string &name)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Cannot specify compile options for target \"" << name << "\" "
        "which is not built by this project.";
   this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
diff --git a/Source/cmTargetIncludeDirectoriesCommand.cxx b/Source/cmTargetIncludeDirectoriesCommand.cxx
index e9f0e047ff..6dc58b13d9 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.cxx
+++ b/Source/cmTargetIncludeDirectoriesCommand.cxx
@@ -25,7 +25,7 @@ bool cmTargetIncludeDirectoriesCommand
 void cmTargetIncludeDirectoriesCommand
 ::HandleImportedTarget(const std::string &tgt)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Cannot specify include directories for imported target \""
     << tgt << "\".";
   this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -35,7 +35,7 @@ void cmTargetIncludeDirectoriesCommand
 void cmTargetIncludeDirectoriesCommand
 ::HandleMissingTarget(const std::string &name)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Cannot specify include directories for target \"" << name << "\" "
        "which is not built by this project.";
   this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 56e1338175..75c94c5440 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -43,7 +43,7 @@ bool cmTargetLinkLibrariesCommand
   if(!this->Target)
     {
     cmake::MessageType t = cmake::FATAL_ERROR;  // fail by default
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Cannot specify link libraries for target \"" << args[0] << "\" "
       << "which is not built by this project.";
     // The bad target is the only argument. Check how policy CMP0016 is set,
@@ -92,7 +92,7 @@ bool cmTargetLinkLibrariesCommand
 
   if(this->Target->GetType() == cmTarget::OBJECT_LIBRARY)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "Object library target \"" << args[0] << "\" "
       << "may not link to anything.";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -102,7 +102,7 @@ bool cmTargetLinkLibrariesCommand
 
   if (this->Target->GetType() == cmTarget::UTILITY)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     const char *modal = 0;
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0039))
@@ -311,7 +311,7 @@ bool cmTargetLinkLibrariesCommand
   // Make sure the last argument was not a library type specifier.
   if(haveLLT)
     {
-    cmOStringStream e;
+    std::ostringstream e;
     e << "The \"" << this->LinkLibraryTypeNames[llt]
       << "\" argument must be followed by a library.";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -342,7 +342,7 @@ void
 cmTargetLinkLibrariesCommand
 ::LinkLibraryTypeSpecifierWarning(int left, int right)
 {
-  cmOStringStream w;
+  std::ostringstream w;
   w << "Link library type specifier \""
     << this->LinkLibraryTypeNames[left] << "\" is followed by specifier \""
     << this->LinkLibraryTypeNames[right] << "\" instead of a library name.  "
@@ -373,7 +373,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
         ? cmTarget::KeywordTLLSignature : cmTarget::PlainTLLSignature;
   if (!this->Target->PushTLLCommandTrace(sig))
     {
-    cmOStringStream e;
+    std::ostringstream e;
     const char *modal = 0;
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0023))
diff --git a/Source/cmTargetSourcesCommand.cxx b/Source/cmTargetSourcesCommand.cxx
index ce3b11e835..515392614b 100644
--- a/Source/cmTargetSourcesCommand.cxx
+++ b/Source/cmTargetSourcesCommand.cxx
@@ -24,7 +24,7 @@ bool cmTargetSourcesCommand
 void cmTargetSourcesCommand
 ::HandleImportedTarget(const std::string &tgt)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Cannot specify sources for imported target \""
     << tgt << "\".";
   this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
@@ -34,7 +34,7 @@ void cmTargetSourcesCommand
 void cmTargetSourcesCommand
 ::HandleMissingTarget(const std::string &name)
 {
-  cmOStringStream e;
+  std::ostringstream e;
   e << "Cannot specify sources for target \"" << name << "\" "
        "which is not built by this project.";
   this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
diff --git a/Source/cmVariableWatchCommand.cxx b/Source/cmVariableWatchCommand.cxx
index debe24340f..9473008e3c 100644
--- a/Source/cmVariableWatchCommand.cxx
+++ b/Source/cmVariableWatchCommand.cxx
@@ -70,7 +70,7 @@ static void cmVariableWatchCommandVariableAccessed(
       {
       arg.FilePath =  "Unknown";
       arg.Line = 0;
-      cmOStringStream error;
+      std::ostringstream error;
       error << "Error in cmake code at\n"
         << arg.FilePath << ":" << arg.Line << ":\n"
         << "A command failed during the invocation of callback \""
@@ -83,7 +83,7 @@ static void cmVariableWatchCommandVariableAccessed(
     }
   if ( !processed )
     {
-    cmOStringStream msg;
+    std::ostringstream msg;
     msg << "Variable \"" << variable << "\" was accessed using "
         << accessString << " with value \"" << (newValue?newValue:"") << "\".";
     makefile->IssueMessage(cmake::LOG, msg.str());
@@ -135,7 +135,7 @@ bool cmVariableWatchCommand
     }
   if ( variable == "CMAKE_CURRENT_LIST_FILE" )
     {
-    cmOStringStream ostr;
+    std::ostringstream ostr;
     ostr << "cannot be set on the variable: " << variable;
     this->SetError(ostr.str());
     return false;
diff --git a/Source/cmXMLParser.cxx b/Source/cmXMLParser.cxx
index 391b874d1a..1d3e0e9379 100644
--- a/Source/cmXMLParser.cxx
+++ b/Source/cmXMLParser.cxx
@@ -54,7 +54,7 @@ int cmXMLParser::ParseFile(const char* file)
     return 0;
     }
 
-  cmOStringStream str;
+  std::ostringstream str;
   str << ifs.rdbuf();
   return this->Parse(str.str().c_str());
 }
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index bbd3fe44fb..5edb7ddcb2 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1182,7 +1182,7 @@ int cmake::DoPreConfigureChecks()
   srcList += "/CMakeLists.txt";
   if(!cmSystemTools::FileExists(srcList.c_str()))
     {
-    cmOStringStream err;
+    std::ostringstream err;
     if(cmSystemTools::FileIsDirectory(this->GetHomeDirectory()))
       {
       err << "The source directory \"" << this->GetHomeDirectory()
@@ -1250,7 +1250,7 @@ int cmake::HandleDeleteCacheVariables(const std::string& var)
     }
   cmCacheManager::CacheIterator ci = this->CacheManager->NewIterator();
   std::vector<SaveCacheEntry> saved;
-  cmOStringStream warning;
+  std::ostringstream warning;
   warning
     << "You have changed variables that require your cache to be deleted.\n"
     << "Configure will be re-run and you may have to reset some variables.\n"
@@ -1971,7 +1971,7 @@ int cmake::CheckBuildSystem()
     {
     if(verbose)
       {
-      cmOStringStream msg;
+      std::ostringstream msg;
       msg << "Re-run cmake no build system arguments\n";
       cmSystemTools::Stdout(msg.str().c_str());
       }
@@ -1983,7 +1983,7 @@ int cmake::CheckBuildSystem()
     {
     if(verbose)
       {
-      cmOStringStream msg;
+      std::ostringstream msg;
       msg << "Re-run cmake missing file: "
           << this->CheckBuildSystemArgument << "\n";
       cmSystemTools::Stdout(msg.str().c_str());
@@ -2003,7 +2003,7 @@ int cmake::CheckBuildSystem()
     {
     if(verbose)
       {
-      cmOStringStream msg;
+      std::ostringstream msg;
       msg << "Re-run cmake error reading : "
           << this->CheckBuildSystemArgument << "\n";
       cmSystemTools::Stdout(msg.str().c_str());
@@ -2045,7 +2045,7 @@ int cmake::CheckBuildSystem()
       {
       if(verbose)
         {
-        cmOStringStream msg;
+        std::ostringstream msg;
         msg << "Re-run cmake, missing byproduct: " << *pi << "\n";
         cmSystemTools::Stdout(msg.str().c_str());
         }
@@ -2068,7 +2068,7 @@ int cmake::CheckBuildSystem()
     // Not enough information was provided to do the test.  Just rerun.
     if(verbose)
       {
-      cmOStringStream msg;
+      std::ostringstream msg;
       msg << "Re-run cmake no CMAKE_MAKEFILE_DEPENDS "
         "or CMAKE_MAKEFILE_OUTPUTS :\n";
       cmSystemTools::Stdout(msg.str().c_str());
@@ -2094,7 +2094,7 @@ int cmake::CheckBuildSystem()
       {
       if(verbose)
         {
-        cmOStringStream msg;
+        std::ostringstream msg;
         msg << "Re-run cmake: build system dependency is missing\n";
         cmSystemTools::Stdout(msg.str().c_str());
         }
@@ -2120,7 +2120,7 @@ int cmake::CheckBuildSystem()
       {
       if(verbose)
         {
-        cmOStringStream msg;
+        std::ostringstream msg;
         msg << "Re-run cmake: build system output is missing\n";
         cmSystemTools::Stdout(msg.str().c_str());
         }
@@ -2138,7 +2138,7 @@ int cmake::CheckBuildSystem()
     {
     if(verbose)
       {
-      cmOStringStream msg;
+      std::ostringstream msg;
       msg << "Re-run cmake file: " << out_oldest
           << " older than: " << dep_newest << "\n";
       cmSystemTools::Stdout(msg.str().c_str());
@@ -2563,7 +2563,7 @@ static bool cmakeCheckStampFile(const char* stampName)
 
   // The build system is up to date.  The stamp file has been removed
   // by the VS IDE due to a "rebuild" request.  Restore it atomically.
-  cmOStringStream stampTempStream;
+  std::ostringstream stampTempStream;
   stampTempStream << stampName << ".tmp" << cmSystemTools::RandomSeed();
   std::string stampTempString = stampTempStream.str();
   const char* stampTemp = stampTempString.c_str();
@@ -2627,7 +2627,7 @@ void cmake::IssueMessage(cmake::MessageType t, std::string const& text,
   cmListFileBacktrace backtrace = bt;
   backtrace.MakeRelative();
 
-  cmOStringStream msg;
+  std::ostringstream msg;
   bool isError = false;
   // Construct the message header.
   if(t == cmake::FATAL_ERROR)
@@ -2835,7 +2835,7 @@ void cmake::RunCheckForUnusedVariables()
 {
 #ifdef CMAKE_BUILD_WITH_CMAKE
   bool haveUnused = false;
-  cmOStringStream msg;
+  std::ostringstream msg;
   msg << "Manually-specified variables were not used by the project:";
   for(std::map<std::string, bool>::const_iterator
         it = this->UsedCliVariables.begin();
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 37d2916df0..d3d85a5a8c 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -36,7 +36,7 @@
 
 void CMakeCommandUsage(const char* program)
 {
-  cmOStringStream errorStream;
+  std::ostringstream errorStream;
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
   errorStream
diff --git a/Tests/CMakeLib/testXMLSafe.cxx b/Tests/CMakeLib/testXMLSafe.cxx
index 60442fab7c..9e4960c184 100644
--- a/Tests/CMakeLib/testXMLSafe.cxx
+++ b/Tests/CMakeLib/testXMLSafe.cxx
@@ -34,7 +34,7 @@ int testXMLSafe(int, char*[])
   for(test_pair const* p = pairs; p->in; ++p)
     {
     cmXMLSafe xs(p->in);
-    cmOStringStream oss;
+    std::ostringstream oss;
     oss << xs;
     std::string out = oss.str();
     if(out != p->out)