[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23

[tpaviot]

The following commit has been merged in the upstream branch:
commit b174c39fec56e5bce8d1a90e438ef00b237132cc
Author: tpaviot <tpaviot at gmail.com>
Date:   Sat Jan 21 06:29:14 2012 +0100

    Fix OSX conflict return type in LDOM_SBuffer::xsputn overload

diff --git a/inc/LDOM_OSStream.hxx b/inc/LDOM_OSStream.hxx
index 3f56200..34aaf04 100644
--- a/inc/LDOM_OSStream.hxx
+++ b/inc/LDOM_OSStream.hxx
@@ -59,7 +59,7 @@ class LDOM_SBuffer : public streambuf
     Standard_EXPORT virtual int underflow();
     //virtual int uflow();
 
-    Standard_EXPORT virtual int xsputn(const char* s, std::streamsize n);
+    Standard_EXPORT virtual std::streamsize xsputn(const char* s, std::streamsize n);
     //virtual int xsgetn(char* s, int n);
     //virtual int sync();
 
diff --git a/src/LDOM/LDOM_OSStream.cxx b/src/LDOM/LDOM_OSStream.cxx
index d3ebcd2..fee6e7b 100644
--- a/src/LDOM/LDOM_OSStream.cxx
+++ b/src/LDOM/LDOM_OSStream.cxx
@@ -111,7 +111,7 @@ int LDOM_SBuffer::underflow()
 //function : xsputn()
 //purpose  : redefined virtual
 //=======================================================================
-int LDOM_SBuffer::xsputn(const char* aStr, std::streamsize n)
+std::streamsize LDOM_SBuffer::xsputn(const char* aStr, std::streamsize n)
 {
   int aLen = n + 1;
   int freeLen = myMaxBuf - myCurString->len - 1;

-- 
OCE packaging