You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2005/04/12 09:31:19 UTC
cvs commit: xml-xerces/c/src/xercesc/util Base64.cpp
amassari 2005/04/12 00:31:19
Modified: c/src/xercesc/util Base64.cpp
Log:
Fix compiler errors on IRIX (jira# 1405)
Revision Changes Path
1.17 +9 -5 xml-xerces/c/src/xercesc/util/Base64.cpp
Index: Base64.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Base64.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Base64.cpp 10 Dec 2004 10:37:56 -0000 1.16
+++ Base64.cpp 12 Apr 2005 07:31:19 -0000 1.17
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.17 2005/04/12 07:31:19 amassari
+ * Fix compiler errors on IRIX (jira# 1405)
+ *
* Revision 1.16 2004/12/10 10:37:56 cargilld
* Fix problem with hexbin::decode and use XMLByte instead of XMLCh for output of decoding.
*
@@ -88,6 +91,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/Janitor.hpp>
#include <xercesc/internal/XMLReader.hpp>
+#include <xercesc/framework/MemoryManager.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -137,14 +141,14 @@
*
*/
-static inline void* getExternalMemory(MemoryManager* const allocator
- , unsigned int const sizeToAllocate)
+static void* getExternalMemory( MemoryManager* const allocator
+ , unsigned int const sizeToAllocate)
{
return allocator ? allocator->allocate(sizeToAllocate)
: ::operator new(sizeToAllocate);
}
-static inline void* getInternalMemory(unsigned int const sizeToAllocate)
+static void* getInternalMemory(unsigned int const sizeToAllocate)
{
return XMLPlatformUtils::fgMemoryManager->allocate(sizeToAllocate);
}
@@ -152,8 +156,8 @@
/***
* internal memory is deallocated by janitorArray
*/
-static inline void returnExternalMemory(MemoryManager* const allocator
- , void* buffer)
+static void returnExternalMemory( MemoryManager* const allocator
+ , void* buffer)
{
allocator ? allocator->deallocate(buffer)
: ::operator delete(buffer);
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org