diff --git a/src/xercesc/internal/IGXMLScanner.cpp b/src/xercesc/internal/IGXMLScanner.cpp
index 8f414b22411c65b874655a26d6b2590d88d05ee9..440fb4e2bffd3bf3427bfa4b3851ae0ff3cdefa4 100644
--- a/src/xercesc/internal/IGXMLScanner.cpp
+++ b/src/xercesc/internal/IGXMLScanner.cpp
@@ -268,7 +268,7 @@ void IGXMLScanner::scanDocument(const InputSource& src)
fDocHandler->endDocument();
//cargill debug:
- fGrammarResolver->getXSModel();
+ //fGrammarResolver->getXSModel();
// Reset the reader manager to close all files, sockets, etc...
fReaderMgr.reset();
diff --git a/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp b/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
index 75cc2c800b31a86fedc4f29f121fdddd4eb6a908..99c82aea619922d719bb5d1d355becf750b12f43 100644
--- a/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
@@ -601,7 +601,7 @@ public:
RecursiveMutex() {
if (pthread_mutex_init(&mutex, NULL))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotCreate, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid.reservedHiId = 0;
tid.reservedLoId = 0;
@@ -610,7 +610,7 @@ public:
~RecursiveMutex() {
if (pthread_mutex_destroy(&mutex))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotDestroy, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
};
void lock() {
@@ -620,7 +620,7 @@ public:
return;
}
if (pthread_mutex_lock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
};
@@ -631,7 +631,7 @@ public:
return;
if (pthread_mutex_unlock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotUnlock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid.reservedHandle= 0;
tid.reservedHiId = 0;
tid.reservedLoId = 0;
diff --git a/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp b/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp
index 081681c5a63ab007956f588ef5ad7eaeb0b43eee..61948153c689b207076f696ef08ab2ef76434179 100644
--- a/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.12 2003/12/17 19:58:05 cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
* Revision 1.11 2003/12/17 15:16:10 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -491,7 +495,7 @@ public:
RecursiveMutex() {
if (pthread_mutex_init(&mutex, NULL))
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
- XMLExcepts::Mutex_CouldNotCreate, fgMemoryManager);
+ XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid = 0;
};
@@ -499,7 +503,7 @@ public:
~RecursiveMutex() {
if (pthread_mutex_destroy(&mutex))
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
- XMLExcepts::Mutex_CouldNotDestroy, fgMemoryManager);
+ XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
};
void lock() {
@@ -510,7 +514,7 @@ public:
}
if (pthread_mutex_lock(&mutex) != 0)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
- XMLExcepts::Mutex_CouldNotLock, fgMemoryManager);
+ XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
};
@@ -521,7 +525,7 @@ public:
if (pthread_mutex_unlock(&mutex) != 0)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
- XMLExcepts::Mutex_CouldNotUnlock, fgMemoryManager);
+ XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid = 0;
};
};
diff --git a/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp b/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
index 2f47b82e8394a8068bd0e8efd580b65a5c944bbd..d1fe564c79e9a158322f14167ac816dbf400cd72 100644
--- a/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
@@ -472,14 +472,14 @@ public:
RecursiveMutex() {
if (pthread_mutex_init(&mutex, NULL))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotCreate, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid = 0;
};
~RecursiveMutex() {
if (pthread_mutex_destroy(&mutex))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotDestroy, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
};
void lock() {
@@ -489,7 +489,7 @@ public:
return;
}
if (pthread_mutex_lock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
};
@@ -500,7 +500,7 @@ public:
return;
if (pthread_mutex_unlock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotUnlock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid = 0;
};
};
diff --git a/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp b/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp
index 6988dfbad363ec241ea1783621b76fa1369a2a0e..0d54b812937b57c34dc9e90db70136df41dfd871 100644
--- a/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp
@@ -463,7 +463,7 @@ public:
RecursiveMutex()
{
if (pthread_mutex_init(&mutex, NULL))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotCreate, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid = 0;
};
@@ -471,7 +471,7 @@ public:
~RecursiveMutex()
{
if (pthread_mutex_destroy(&mutex))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotDestroy, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
};
void lock()
@@ -482,7 +482,7 @@ public:
return;
}
if (pthread_mutex_lock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
};
@@ -494,7 +494,7 @@ public:
return;
if (pthread_mutex_unlock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotUnlock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid = 0;
};
};
diff --git a/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp b/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
index b4348b2c44861385c6eeaf79f88e40e728d22e79..4e7566355a719c717c1d3a28e18739f03be1f16e 100644
--- a/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.14 2003/12/17 19:58:05 cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
* Revision 1.13 2003/12/17 15:16:10 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -535,14 +539,14 @@ public:
RecursiveMutex() {
if (pthread_mutex_init(&mutex, NULL))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotCreate, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid = 0;
};
~RecursiveMutex() {
if (pthread_mutex_destroy(&mutex))
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotDestroy, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
};
void lock() {
@@ -552,7 +556,7 @@ public:
return;
}
if (pthread_mutex_lock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
};
@@ -563,7 +567,7 @@ public:
return;
if (pthread_mutex_unlock(&mutex) != 0)
- ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotUnlock, fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid = 0;
};
};