svn commit: r671336 - in /xerces/c/branches/dbertoni/transcoder/src/xercesc/util/Transcoders/IconvGNU: IconvGNUTransService.cpp IconvGNUTransService.hpp

[dbertoni]

Author: dbertoni
Date: Tue Jun 24 13:45:30 2008
New Revision: 671336

URL: http://svn.apache.org/viewvc?rev=671336&view=rev
Log:
Changes to propagate explicit MemoryManager instances into the transcoders.

Modified:
    
xerces/c/branches/dbertoni/transcoder/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
    
xerces/c/branches/dbertoni/transcoder/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp

Modified: 
xerces/c/branches/dbertoni/transcoder/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/branches/dbertoni/transcoder/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp?rev=671336&r1=671335&r2=671336&view=diff
==============================================================================
--- 
xerces/c/branches/dbertoni/transcoder/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
 (original)
+++ 
xerces/c/branches/dbertoni/transcoder/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
 Tue Jun 24 13:45:30 2008
@@ -170,9 +170,10 @@
 IconvGNUWrapper::IconvGNUWrapper ( iconv_t    cd_from,
                iconv_t    cd_to,
                size_t    uchsize,
-               unsigned int    ubo )
+               unsigned int    ubo,
+               MemoryManager* manager)
     : fUChSize(uchsize), fUBO(ubo),
-      fCDTo(cd_to), fCDFrom(cd_from)
+      fCDTo(cd_to), fCDFrom(cd_from), fMutex(manager)
 {
     if (fCDFrom == (iconv_t) -1 || fCDTo == (iconv_t) -1) {
         XMLPlatformUtils::panic (PanicHandler::Panic_NoTransService);
@@ -548,7 +549,7 @@
 
 XMLLCPTranscoder* IconvGNUTransService::makeNewLCPTranscoder(MemoryManager* 
manager)
 {
-    return new (manager) IconvGNULCPTranscoder (cdFrom(), cdTo(), uChSize(), 
UBO());
+    return new (manager) IconvGNULCPTranscoder (cdFrom(), cdTo(), uChSize(), 
UBO(), manager);
 }
 
 bool IconvGNUTransService::supportsSrcOfs() const
@@ -942,8 +943,9 @@
 IconvGNULCPTranscoder::IconvGNULCPTranscoder (iconv_t        cd_from,
                         iconv_t        cd_to,
                         size_t        uchsize,
-                        unsigned int    ubo)
-    : IconvGNUWrapper (cd_from, cd_to, uchsize, ubo)
+                        unsigned int    ubo,
+                        MemoryManager* manager)
+    : IconvGNUWrapper (cd_from, cd_to, uchsize, ubo, manager)
 {
 }
 
@@ -965,7 +967,7 @@
                       , MemoryManager* const manager
     )
     : XMLTranscoder(encodingName, blockSize, manager)
-    , IconvGNUWrapper (cd_from, cd_to, uchsize, ubo)
+    , IconvGNUWrapper (cd_from, cd_to, uchsize, ubo, manager)
 {
 }
 

Modified: 
xerces/c/branches/dbertoni/transcoder/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
URL: 
http://svn.apache.org/viewvc/xerces/c/branches/dbertoni/transcoder/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp?rev=671336&r1=671335&r2=671336&view=diff
==============================================================================
--- 
xerces/c/branches/dbertoni/transcoder/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
 (original)
+++ 
xerces/c/branches/dbertoni/transcoder/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
 Tue Jun 24 13:45:30 2008
@@ -44,7 +44,8 @@
       iconv_t          cd_from,
       iconv_t          cd_to,
       size_t           uchsize,
-      unsigned int     ubo
+      unsigned int     ubo,
+      MemoryManager* manager
     );
     virtual ~IconvGNUWrapper();
 
@@ -295,7 +296,8 @@
       iconv_t          from,
       iconv_t          to,
       size_t           uchsize,
-      unsigned int     ubo
+      unsigned int     ubo,
+      MemoryManager* manager
     );
 
 protected:



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]