From 7b26ce0fca858cbe3ef1f98ccba6b91fdcefc19f Mon Sep 17 00:00:00 2001
From: Khaled Noaman <knoaman@apache.org>
Date: Tue, 13 Jan 2004 16:17:10 +0000
Subject: [PATCH] Fo sanity, use class name to qualify method
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@175674 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/util/EncodingValidator.cpp | 5 ++++-
src/xercesc/util/regx/RangeTokenMap.cpp | 5 ++++-
src/xercesc/validators/DTD/DTDGrammar.cpp | 5 ++++-
src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp | 5 ++++-
src/xercesc/validators/schema/ComplexTypeInfo.cpp | 5 ++++-
src/xercesc/validators/schema/GeneralAttributeCheck.cpp | 5 ++++-
6 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/xercesc/util/EncodingValidator.cpp b/src/xercesc/util/EncodingValidator.cpp
index 329aeb97e..2fad0e43b 100644
--- a/src/xercesc/util/EncodingValidator.cpp
+++ b/src/xercesc/util/EncodingValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2004/01/13 16:17:10 knoaman
+ * Fo sanity, use class name to qualify method
+ *
* Revision 1.4 2004/01/09 22:41:58 knoaman
* Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
*
@@ -170,7 +173,7 @@ EncodingValidator* EncodingValidator::instance()
if (!fInstance)
{
fInstance = new EncodingValidator();
- instanceCleanup.registerCleanup(reinitInstance);
+ instanceCleanup.registerCleanup(EncodingValidator::reinitInstance);
}
}
diff --git a/src/xercesc/util/regx/RangeTokenMap.cpp b/src/xercesc/util/regx/RangeTokenMap.cpp
index 0196f72cf..550c2d60b 100644
--- a/src/xercesc/util/regx/RangeTokenMap.cpp
+++ b/src/xercesc/util/regx/RangeTokenMap.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/13 16:17:10 knoaman
+ * Fo sanity, use class name to qualify method
+ *
* Revision 1.8 2004/01/09 22:41:58 knoaman
* Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
*
@@ -346,7 +349,7 @@ RangeTokenMap* RangeTokenMap::instance()
if (!fInstance)
{
fInstance = new RangeTokenMap();
- rangeTokMapInstanceCleanup.registerCleanup(reinitInstance);
+ rangeTokMapInstanceCleanup.registerCleanup(RangeTokenMap::reinitInstance);
}
}
diff --git a/src/xercesc/validators/DTD/DTDGrammar.cpp b/src/xercesc/validators/DTD/DTDGrammar.cpp
index 847f72745..0980bd852 100644
--- a/src/xercesc/validators/DTD/DTDGrammar.cpp
+++ b/src/xercesc/validators/DTD/DTDGrammar.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.15 2004/01/13 16:17:09 knoaman
+ * Fo sanity, use class name to qualify method
+ *
* Revision 1.14 2004/01/09 22:41:58 knoaman
* Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
*
@@ -311,7 +314,7 @@ void DTDGrammar::resetEntityDeclPool() {
fDefaultEntities->put(new DTDEntityDecl(XMLUni::fgApos, chSingleQuote, true, true));
// register cleanup method
- entityPoolRegistryCleanup.registerCleanup(reinitDfltEntities);
+ entityPoolRegistryCleanup.registerCleanup(DTDGrammar::reinitDfltEntities);
sEntityPoolMutexRegistered = true;
}
}
diff --git a/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp b/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
index 1c0f9734e..2297a1185 100644
--- a/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
+++ b/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.26 2004/01/13 16:17:09 knoaman
+ * Fo sanity, use class name to qualify method
+ *
* Revision 1.25 2004/01/09 22:41:58 knoaman
* Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
*
@@ -815,7 +818,7 @@ void DatatypeValidatorFactory::expandRegistryToFullSchemaSet()
initCanRepRegistory();
// register cleanup method
- builtInRegistryCleanup.registerCleanup(reinitRegistry);
+ builtInRegistryCleanup.registerCleanup(DatatypeValidatorFactory::reinitRegistry);
sBuiltInRegistryMutexRegistered = true;
}
}
diff --git a/src/xercesc/validators/schema/ComplexTypeInfo.cpp b/src/xercesc/validators/schema/ComplexTypeInfo.cpp
index 7772886f7..401d256fe 100644
--- a/src/xercesc/validators/schema/ComplexTypeInfo.cpp
+++ b/src/xercesc/validators/schema/ComplexTypeInfo.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.25 2004/01/13 16:17:09 knoaman
+ * Fo sanity, use class name to qualify method
+ *
* Revision 1.24 2004/01/09 22:41:58 knoaman
* Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
*
@@ -327,7 +330,7 @@ ComplexTypeInfo* ComplexTypeInfo::getAnyType(unsigned int emptyNSId)
fAnyType->setAttWildCard(attWildCard);
// register cleanup method
- anyTypeCleanup.registerCleanup(reinitAnyType);
+ anyTypeCleanup.registerCleanup(ComplexTypeInfo::reinitAnyType);
sAnyTypeMutexRegistered = true;
}
}
diff --git a/src/xercesc/validators/schema/GeneralAttributeCheck.cpp b/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
index 5356d616a..7730de2d4 100644
--- a/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
+++ b/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.20 2004/01/13 16:17:09 knoaman
+ * Fo sanity, use class name to qualify method
+ *
* Revision 1.19 2004/01/09 22:41:58 knoaman
* Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
*
@@ -287,7 +290,7 @@ void GeneralAttributeCheck::mapElements()
mapAttributes();
// register for cleanup at Termination.
- sGeneralAttCheckCleanup.registerCleanup(reinitGeneralAttCheck);
+ sGeneralAttCheckCleanup.registerCleanup(GeneralAttributeCheck::reinitGeneralAttCheck);
sGeneralAttCheckMutexRegistered = true;
}
}
--
GitLab