瀏覽代碼

BUG: Remove stringstream implementation, this was a wrong interface anyway.

Mathieu Malaterre 19 年之前
父節點
當前提交
55af790ebf
共有 2 個文件被更改,包括 3 次插入44 次删除
  1. 2 14
      Source/kwsys/kwsys_ios_sstream.h.in
  2. 1 30
      Source/kwsys/testIOS.cxx

+ 2 - 14
Source/kwsys/kwsys_ios_sstream.h.in

@@ -64,7 +64,6 @@ using @KWSYS_NAMESPACE@_ios_namespace::ostream;
 using @KWSYS_NAMESPACE@_ios_namespace::istream;
 using @KWSYS_NAMESPACE@_ios_namespace::istrstream;
 using @KWSYS_NAMESPACE@_ios_namespace::ostrstream;
-using @KWSYS_NAMESPACE@_ios_namespace::strstream;
 using @KWSYS_NAMESPACE@_ios_namespace::ios;
 using @KWSYS_NAMESPACE@_ios_namespace::endl;
 using @KWSYS_NAMESPACE@_ios_namespace::ends;
@@ -92,9 +91,9 @@ public:
     {
     ostringstream_cleanup cleanup(*this);
     ostringstream_cleanup::IgnoreUnusedVariable(cleanup);
-    int count = this->pcount();
+    int pcount = this->pcount();
     const char* ptr = this->Superclass::str();
-    return kwsys_stl::string(ptr?ptr:"", count);
+    return kwsys_stl::string(ptr?ptr:"", pcount);
     }
   void str(const kwsys_stl::string& s)
     {
@@ -135,17 +134,6 @@ private:
 # pragma warning (pop)
 #endif
 
-class stringstream: public istringstream, public ostringstream
-{
-public:
-  stringstream():istringstream(),ostringstream() {}
-  kwsys_stl::string str() const { return istringstream::str(); }
-  kwsys_stl::string str() { return ostringstream::str(); }
-private:
-  stringstream(const stringstream&);
-  void operator=(const stringstream&);
-};
-
 } // namespace @KWSYS_NAMESPACE@_ios
 
 #endif

+ 1 - 30
Source/kwsys/testIOS.cxx

@@ -13,37 +13,8 @@
 
 int main()
 {
-  const char refstring[] =  "Hello, World!";
   kwsys_ios::ostringstream ostr;
-  ostr << refstring;
+  ostr << "Hello, World!";
   kwsys_ios::cout << ostr.str() << kwsys_ios::endl;
-  if( ostr.str() != refstring )
-    {
-    return 1;
-    }
-
-
-  kwsys_ios::istringstream istr;
-  istr.str( refstring );
-  kwsys_ios::cout << istr.str() << kwsys_ios::endl;
-  if( istr.str() != refstring )
-    {
-    return 1;
-    }
-
-
-  const int val = 12345;
-  const char valstr[] = "12345";
-  kwsys_ios::stringstream sstr;
-  sstr << val;
-  int v = 0;
-  sstr >> v;
-  kwsys_ios::cout << sstr.str() << kwsys_ios::endl;
-  if( /*v != val ||*/ sstr.str() != valstr)
-    {
-    kwsys_ios::cerr << v << " should be " << val << kwsys_ios::endl;
-    return 1;
-    }
-
   return 0;
 }