summaryrefslogtreecommitdiffstats
path: root/Source/kwsys/testSystemTools.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-10-31 17:11:58 (GMT)
committerBrad King <brad.king@kitware.com>2014-10-31 17:11:58 (GMT)
commit5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8 (patch)
treea73f41ac49686a9adc8bb27d0c9729833a22580d /Source/kwsys/testSystemTools.cxx
parent8b16e62c7a10c246744327cde38b0b1d70eb8c48 (diff)
parent72b5b48040ed65fdb54b8ffeb3326b456586b8c8 (diff)
downloadCMake-5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8.zip
CMake-5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8.tar.gz
CMake-5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8.tar.bz2
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/testSystemTools.cxx')
-rw-r--r--Source/kwsys/testSystemTools.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/kwsys/testSystemTools.cxx b/Source/kwsys/testSystemTools.cxx
index b41532b..42b6249 100644
--- a/Source/kwsys/testSystemTools.cxx
+++ b/Source/kwsys/testSystemTools.cxx
@@ -124,7 +124,7 @@ static bool CheckFileOperations()
res = false;
}
- if (kwsys::SystemTools::FileLength(testBinFile.c_str()) != 766)
+ if (kwsys::SystemTools::FileLength(testBinFile) != 766)
{
kwsys_ios::cerr
<< "Problem with FileLength - incorrect length for: "
@@ -512,7 +512,7 @@ static bool CheckStringOperations()
//----------------------------------------------------------------------------
-static bool CheckPutEnv(const char* env, const char* name, const char* value)
+static bool CheckPutEnv(const kwsys_stl::string& env, const char* name, const char* value)
{
if(!kwsys::SystemTools::PutEnv(env))
{