summaryrefslogtreecommitdiffstats
path: root/Source/cmSystemTools.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-01-12 13:57:39 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-01-12 13:57:39 (GMT)
commitb5a467262b61065ed5d1b8d545cc2ade548b9d0b (patch)
tree8aa5908e3731be5fcf097de849fef3a432388162 /Source/cmSystemTools.cxx
parent6c61ffaf9b1616e6938b78ca19f17f9a9f87f3ec (diff)
parent0f7bdd61da51ea8609246fe6fd05a13235fe75db (diff)
downloadCMake-b5a467262b61065ed5d1b8d545cc2ade548b9d0b.zip
CMake-b5a467262b61065ed5d1b8d545cc2ade548b9d0b.tar.gz
CMake-b5a467262b61065ed5d1b8d545cc2ade548b9d0b.tar.bz2
Merge topic 'drop-ancient-workarounds'
0f7bdd61 Remove VS 6 special case. 5e92c826 Remove some obsolete stuff. 15e42bb2 cmStandardIncludes: Remove obsolete cmOStringStream. 931e055d Port all cmOStringStream to std::ostringstream. f194a009 Remove unused cmIStringStream class. 3ec1bb15 cmStandardIncludes: Remove std namespace hack. bb3bce70 cmStandardIncludes: Remove ANSI_FOR_SCOPE hack. 28fa4923 cmStandardIncludes: Remove iostreams workaround for obsolete Compaq compiler. 837a8a63 cmStandardIncludes: Drop Comeau-related workaround. 4030ddfd Remove Borland-related undef. 17d6a6fd cmStandardIncludes: Remove comment about Borland. 26fb5011 Drop SGI as a CMake host compiler.
Diffstat (limited to 'Source/cmSystemTools.cxx')
-rw-r--r--Source/cmSystemTools.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 54dafd2..fb973d4 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -79,10 +79,6 @@ public:
#endif
};
-#if defined(__sgi) && !defined(__GNUC__)
-# pragma set woff 1375 /* base class destructor not virtual */
-#endif
-
#if !defined(HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE)
// For GetEnvironmentVariables
# if defined(_WIN32)
@@ -2501,7 +2497,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"