From d36357bd3c9918cfc2822ae18f9e566a8eb2577b Mon Sep 17 00:00:00 2001
From: Neil Graham <neilg@apache.org>
Date: Sat, 15 Nov 2003 21:19:01 +0000
Subject: [PATCH] fixes for compilation under gcc
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@175392 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/framework/psvi/XSModel.hpp | 5 ++++-
src/xercesc/framework/psvi/XSObject.cpp | 8 +++-----
src/xercesc/framework/psvi/XSObject.hpp | 8 ++++++++
src/xercesc/framework/psvi/XSTypeDefinition.cpp | 8 +++-----
src/xercesc/framework/psvi/XSTypeDefinition.hpp | 8 ++++++++
5 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/src/xercesc/framework/psvi/XSModel.hpp b/src/xercesc/framework/psvi/XSModel.hpp
index 5046227d8..ee7c39872 100644
--- a/src/xercesc/framework/psvi/XSModel.hpp
+++ b/src/xercesc/framework/psvi/XSModel.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/11/15 21:18:39 neilg
+ * fixes for compilation under gcc
+ *
* Revision 1.5 2003/11/14 22:47:53 neilg
* fix bogus log message from previous commit...
*
@@ -294,7 +297,7 @@ private:
XSModel & operator=(const XSModel &);
protected:
- friend XSObject;
+ friend class XSObject;
// -----------------------------------------------------------------------
// data members
// -----------------------------------------------------------------------
diff --git a/src/xercesc/framework/psvi/XSObject.cpp b/src/xercesc/framework/psvi/XSObject.cpp
index 2785932c6..0a6b9498a 100644
--- a/src/xercesc/framework/psvi/XSObject.cpp
+++ b/src/xercesc/framework/psvi/XSObject.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2003/11/15 21:18:39 neilg
+ * fixes for compilation under gcc
+ *
* Revision 1.6 2003/11/14 22:47:53 neilg
* fix bogus log message from previous commit...
*
@@ -105,11 +108,6 @@ const XMLCh *XSObject::getNamespace()
return 0;
}
-inline XSConstants::COMPONENT_TYPE XSObject::getType() const
-{
- return fComponentType;
-}
-
XSNamespaceItem *XSObject::getNamespaceItem()
{
return 0;
diff --git a/src/xercesc/framework/psvi/XSObject.hpp b/src/xercesc/framework/psvi/XSObject.hpp
index 5e18db428..1cb4d0418 100644
--- a/src/xercesc/framework/psvi/XSObject.hpp
+++ b/src/xercesc/framework/psvi/XSObject.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2003/11/15 21:18:39 neilg
+ * fixes for compilation under gcc
+ *
* Revision 1.6 2003/11/14 22:47:53 neilg
* fix bogus log message from previous commit...
*
@@ -198,6 +201,11 @@ protected:
};
inline XSObject::~XSObject() {}
+inline XSConstants::COMPONENT_TYPE XSObject::getType() const
+{
+ return fComponentType;
+}
+
XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/framework/psvi/XSTypeDefinition.cpp b/src/xercesc/framework/psvi/XSTypeDefinition.cpp
index 7a5b5c431..dc02b76dc 100644
--- a/src/xercesc/framework/psvi/XSTypeDefinition.cpp
+++ b/src/xercesc/framework/psvi/XSTypeDefinition.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2003/11/15 21:18:39 neilg
+ * fixes for compilation under gcc
+ *
* Revision 1.4 2003/11/14 22:47:53 neilg
* fix bogus log message from previous commit...
*
@@ -90,11 +93,6 @@ XSTypeDefinition::XSTypeDefinition(TYPE_CATEGORY typeCategory,
}
// XSTypeDefinition implementation
-inline XSTypeDefinition::TYPE_CATEGORY XSTypeDefinition::getTypeCategory() const
-{
- return fTypeCategory;
-}
-
bool XSTypeDefinition::isFinal(short toTest)
{
diff --git a/src/xercesc/framework/psvi/XSTypeDefinition.hpp b/src/xercesc/framework/psvi/XSTypeDefinition.hpp
index 59ad9a936..1f96d1ee2 100644
--- a/src/xercesc/framework/psvi/XSTypeDefinition.hpp
+++ b/src/xercesc/framework/psvi/XSTypeDefinition.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2003/11/15 21:19:01 neilg
+ * fixes for compilation under gcc
+ *
* Revision 1.4 2003/11/14 22:47:53 neilg
* fix bogus log message from previous commit...
*
@@ -257,6 +260,11 @@ protected:
};
inline XSTypeDefinition::~XSTypeDefinition() {}
+inline XSTypeDefinition::TYPE_CATEGORY XSTypeDefinition::getTypeCategory() const
+{
+ return fTypeCategory;
+}
+
XERCES_CPP_NAMESPACE_END
#endif
--
GitLab