Merge pull request #441 from tpaviot/review/fix-writing-XCAF

Fix writing of XML CAF documents
tpaviot · Dec 26, 2013 · d94733c · d94733c
2 parents 0871b15 + 5a5a477
commit d94733c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/LDOM/LDOM_OSStream.cxx b/src/LDOM/LDOM_OSStream.cxx
@@ -102,7 +102,7 @@ Standard_CString LDOM_SBuffer::str () const
 //function : overflow()
 //purpose  : redefined virtual
 //=======================================================================
-int LDOM_SBuffer::overflow(signed char c)
+int LDOM_SBuffer::overflow(int c)
 {
   char cc = (char)c;
   return (int)xsputn(&cc,1);

diff --git a/src/LDOM/LDOM_OSStream.hxx b/src/LDOM/LDOM_OSStream.hxx
@@ -67,7 +67,7 @@ class LDOM_SBuffer : public streambuf
 
     // Methods of streambuf
 
-    Standard_EXPORT virtual int overflow(signed char c = EOF);
+    Standard_EXPORT virtual int overflow(int c = EOF);
     Standard_EXPORT virtual int underflow();
     //virtual int uflow();
 

diff --git a/test/OCAFExport_test/OCAFExport_test.cpp b/test/OCAFExport_test/OCAFExport_test.cpp
@@ -4,6 +4,8 @@
 #include <OSD_File.hxx>
 #include <OSD_Path.hxx>
 #include <TCollection_ExtendedString.hxx>
+#include <LDOM_OSStream.hxx>
+#include <iostream>
 #include <gtest/gtest.h>
 
 Handle(TDocStd_Application) app = new AppStd_Application();
@@ -45,6 +47,15 @@ TEST(OCAFExportTestSuite, testExportNonAscii)
     delete[] filename;
 }
 
+TEST(OCAFExportTestSuite, testOverflow)
+{
+    // See https://github.com/tpaviot/oce/pull/441
+    LDOM_OSStream oss(128);
+    oss << "line 1" << std::endl;
+    oss << "line 2" << std::endl;
+    ASSERT_TRUE(strlen(oss.str()) == 14);
+}
+
 int main(int argc, char **argv){
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();