diff options
| author | Brad King <brad.king@kitware.com> | 2006-08-01 15:38:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-08-01 15:38:42 (GMT) |
| commit | ab61137eb177d9606ad3fa47b6b08d22b9993279 (patch) | |
| tree | ce57b66cd29b6dc1dab00d196eeeda84e8ef82a2 /Source/kwsys | |
| parent | 7776d18896bda01c743317dd45fd5c816e8f408a (diff) | |
| download | CMake-ab61137eb177d9606ad3fa47b6b08d22b9993279.zip CMake-ab61137eb177d9606ad3fa47b6b08d22b9993279.tar.gz CMake-ab61137eb177d9606ad3fa47b6b08d22b9993279.tar.bz2 | |
COMP: Fix and/or disable warnings for Borland 5.6 build.
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/CommandLineArguments.cxx | 2 | ||||
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 2 | ||||
| -rw-r--r-- | Source/kwsys/testProcess.c | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Source/kwsys/CommandLineArguments.cxx b/Source/kwsys/CommandLineArguments.cxx index 20fb3ef..5a550b5 100644 --- a/Source/kwsys/CommandLineArguments.cxx +++ b/Source/kwsys/CommandLineArguments.cxx @@ -216,7 +216,7 @@ int CommandLineArguments::Parse() // additional value CommandLineArgumentsCallbackStructure *cs = &this->Internals->Callbacks[matches[maxidx]]; - const CommandLineArguments::Internal::String& sarg = matches[maxidx]; + const kwsys_stl::string& sarg = matches[maxidx]; if ( cs->Argument != sarg ) { abort(); diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index c6b57c0..bd824d3 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -3348,7 +3348,7 @@ kwsys_stl::string SystemTools::GetCurrentDateTime(const char* format) time_t t; time(&t); strftime(buf, sizeof(buf), format, localtime(&t)); - return buf; + return kwsys_stl::string(buf); } kwsys_stl::string SystemTools::MakeCindentifier(const char* s) diff --git a/Source/kwsys/testProcess.c b/Source/kwsys/testProcess.c index f87f1e0..e9fc224 100644 --- a/Source/kwsys/testProcess.c +++ b/Source/kwsys/testProcess.c @@ -30,6 +30,10 @@ # include <unistd.h> #endif +#if defined(__BORLANDC__) +# pragma warn -8060 /* possibly incorrect assignment */ +#endif + int runChild(const char* cmd[], int state, int exception, int value, int share, int output, int delay, double timeout, int poll, int repeat, int disown); @@ -196,7 +200,6 @@ int test8_grandchild(int argc, const char* argv[]) return 0; } - int runChild2(kwsysProcess* kp, const char* cmd[], int state, int exception, int value, int share, int output, int delay, double timeout, |