diff options
| author | Brad King <brad.king@kitware.com> | 2007-04-19 15:21:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-04-19 15:21:35 (GMT) |
| commit | 28f6b148f6a9241ede644aa2ca1497b86586eec2 (patch) | |
| tree | 82bdaf290aab9c0fb38e90a0d3672ab7316b3d2a /Source | |
| parent | affd99a9a9a7896356ca3086b0a4634471386f2f (diff) | |
| download | CMake-28f6b148f6a9241ede644aa2ca1497b86586eec2.zip CMake-28f6b148f6a9241ede644aa2ca1497b86586eec2.tar.gz CMake-28f6b148f6a9241ede644aa2ca1497b86586eec2.tar.bz2 | |
ENH: Fixed stl string streaming operators for Watcom.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Source/kwsys/kwsys_stl_string.hxx.in | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index bba7e38..eeb6809 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -395,17 +395,17 @@ ELSE(KWSYS_STL_HAS_ALLOCATOR_TEMPLATE) ENDIF(KWSYS_STL_HAS_ALLOCATOR_TEMPLATE) KWSYS_PLATFORM_CXX_TEST(KWSYS_STL_HAS_ALLOCATOR_OBJECTS "Checking whether stl containers support allocator objects." DIRECT) -IF(KWSYS_IOS_USE_ANSI) +IF(KWSYS_IOS_USE_ANSI AND NOT WATCOM) # ANSI streams always have string operators. SET(KWSYS_STL_STRING_HAVE_OSTREAM 1) SET(KWSYS_STL_STRING_HAVE_ISTREAM 1) -ELSE(KWSYS_IOS_USE_ANSI) +ELSE(KWSYS_IOS_USE_ANSI AND NOT WATCOM) # There may not be string operators for old streams. KWSYS_PLATFORM_CXX_TEST(KWSYS_STL_STRING_HAVE_OSTREAM "Checking whether stl string has ostream operator<<" DIRECT) KWSYS_PLATFORM_CXX_TEST(KWSYS_STL_STRING_HAVE_ISTREAM "Checking whether stl string has istream operator>>" DIRECT) -ENDIF(KWSYS_IOS_USE_ANSI) +ENDIF(KWSYS_IOS_USE_ANSI AND NOT WATCOM) SET(KWSYS_PLATFORM_CXX_TEST_DEFINES) KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS diff --git a/Source/kwsys/kwsys_stl_string.hxx.in b/Source/kwsys/kwsys_stl_string.hxx.in index 3124c11..37e023f 100644 --- a/Source/kwsys/kwsys_stl_string.hxx.in +++ b/Source/kwsys/kwsys_stl_string.hxx.in @@ -29,6 +29,13 @@ # define @KWSYS_NAMESPACE@_STL_STRING_ISTREAM_DEFINED # include <ctype.h> // isspace # include <@KWSYS_NAMESPACE@/ios/iostream> +# if defined(__WATCOMC__) +namespace @KWSYS_NAMESPACE@ +{ +struct ios_istream_hack: public kwsys_ios::istream +{ void eatwhite() { this->@KWSYS_NAMESPACE@_ios::istream::eatwhite(); } }; +} +# endif inline @KWSYS_NAMESPACE@_ios::istream& operator>>(@KWSYS_NAMESPACE@_ios::istream& is, @KWSYS_NAMESPACE@_stl::string& s) @@ -43,8 +50,12 @@ operator>>(@KWSYS_NAMESPACE@_ios::istream& is, s.erase(); // Skip leading whitespace. +#if defined(__WATCOMC__) + static_cast<@KWSYS_NAMESPACE@::ios_istream_hack&>(is).eatwhite(); +#else is.eatwhite(); - istream& okay = is; +#endif + @KWSYS_NAMESPACE@_ios::istream& okay = is; if(okay) { |