You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by jb...@apache.org on 2005/06/03 01:55:25 UTC

svn commit: r179675 - /xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp /xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp

Author: jberry
Date: Thu Jun  2 16:55:25 2005
New Revision: 179675

URL: http://svn.apache.org/viewcvs?rev=179675&view=rev
Log:
Sync MacOS transcoder with Axel's transcoder change

Modified:
    xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
    xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp

Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp?rev=179675&r1=179674&r2=179675&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp Thu Jun  2 16:55:25 2005
@@ -806,15 +806,6 @@
 
 
 char*
-MacOSLCPTranscoder::transcode(const XMLCh* const srcText)
-{
-	//	Transcode using a memory manager that allocates
-	//	memory using new[].
-	return transcode(srcText, XMLPlatformUtils::fgArrayMemoryManager);
-}
-
-
-char*
 MacOSLCPTranscoder::transcode(const XMLCh* const srcText,
                               MemoryManager* const manager)
 {
@@ -887,15 +878,6 @@
 	}
 
 	return result.release();
-}
-
-
-XMLCh*
-MacOSLCPTranscoder::transcode(const char* const srcText)
-{
-	//	Transcode using a memory manager that allocates
-	//	memory using new[].
-	return transcode(srcText, XMLPlatformUtils::fgArrayMemoryManager);
 }
 
 

Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp?rev=179675&r1=179674&r2=179675&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp Thu Jun  2 16:55:25 2005
@@ -233,13 +233,21 @@
     virtual XMLCh* transcode(const char* const toTranscode,
                             MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
 
+	// -----------------------------------------------------------------------
+    //  DEPRECATED old transcode interface
+    // -----------------------------------------------------------------------
+    virtual unsigned int calcRequiredSize(const char* const srcText
+        , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
+
+    virtual unsigned int calcRequiredSize(const XMLCh* const srcText
+        , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
+
     virtual bool transcode
     (
         const   char* const     toTranscode
         ,       XMLCh* const    toFill
         , const unsigned int    maxChars
-        , size_t               &lettersWritten
-        , size_t               &bytesConsumed
+        , MemoryManager* const  manager = XMLPlatformUtils::fgMemoryManager
     );
 
     virtual bool transcode
@@ -247,19 +255,8 @@
         const   XMLCh* const    toTranscode
         ,       char* const     toFill
         , const unsigned int    maxChars
-        , size_t               &bytesWritten
-        , size_t               &lettersConsumed
+        , MemoryManager* const  manager = XMLPlatformUtils::fgMemoryManager
     );
-
-    // -----------------------------------------------------------------------
-    //  DEPRECATED old transcode interface
-    // -----------------------------------------------------------------------
-    virtual unsigned int calcRequiredSize(const char* const srcText
-        , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
-
-    virtual unsigned int calcRequiredSize(const XMLCh* const srcText
-        , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
-
 
 private :
     // -----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org