ChangeLogTag:Fri Jan 25 14:40:15 2002 Nanbor Wang <nanbor@cs.wustl.edu>

7 files changed, 70 insertions, 43 deletions

diff --git a/ACEXML/common/Exception.cpp b/ACEXML/common/Exception.cpp
index f5cde1d4eae..ee64ef44e1d 100644
--- a/ACEXML/common/Exception.cpp
+++ b/ACEXML/common/Exception.cpp
@@ -4,10 +4,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/ACE.h"
 
-#if !defined (__ACEXML_INLINE__)
-# include "common/Exception.i"
-#endif /* __ACEXML_INLINE__ */
-
 static const ACEXML_Char ACEXML_Exception_name[] = {
   'A', 'C', 'E', 'X', 'M', 'L',
   '_', 'E', 'x', 'c', 'e', 'p',
@@ -17,6 +13,10 @@ const ACEXML_Char *ACEXML_Exception::exception_name_ = ACEXML_Exception_name;
 static const ACEXML_Char ACEXML_Exception_null [] = {0};
 const ACEXML_Char *ACEXML_Exception::null_ = ACEXML_Exception_null;
 
+#if !defined (__ACEXML_INLINE__)
+# include "common/Exception.i"
+#endif /* __ACEXML_INLINE__ */
+
 ACEXML_Exception::ACEXML_Exception (void)
 {
 }
diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp
index dc5e1ecc825..a1961829987 100644
--- a/ACEXML/common/NamespaceSupport.cpp
+++ b/ACEXML/common/NamespaceSupport.cpp
@@ -2,10 +2,6 @@
 
 #include "common/NamespaceSupport.h"
 
-#if !defined (__ACEXML_INLINE__)
-# include "common/NamespaceSupport.i"
-#endif /* __ACEXML_INLINE__ */
-
 static const ACEXML_Char ACEXML_XMLNS_PREFIX_name[] = {'x', 'm', 'l', 'n', 's', 0};
 const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS_PREFIX = ACEXML_XMLNS_PREFIX_name;
 
@@ -23,8 +19,9 @@ static const ACEXML_Char ACEXML_XMLNS_URI_name[] = {
     'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', 0};
 const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS = ACEXML_XMLNS_URI_name;
 
-
-
+#if !defined (__ACEXML_INLINE__)
+# include "common/NamespaceSupport.i"
+#endif /* __ACEXML_INLINE__ */
 
 ACEXML_Namespace_Context_Stack::ACEXML_Namespace_Context_Stack (void)
   : head_ (0)
diff --git a/ACEXML/common/SAXExceptions.cpp b/ACEXML/common/SAXExceptions.cpp
index 9b310d162d8..3a7c3f72a47 100644
--- a/ACEXML/common/SAXExceptions.cpp
+++ b/ACEXML/common/SAXExceptions.cpp
@@ -4,16 +4,39 @@
 #include "ace/Log_Msg.h"
 #include "ace/ACE.h"
 
-#if !defined (__ACEXML_INLINE__)
-# include "common/SAXExceptions.i"
-#endif /* __ACEXML_INLINE__ */
-
 static const ACEXML_Char ACEXML_SAXException_name[] = {
   'A', 'C', 'E', 'X', 'M', 'L',
   'S', 'A', 'X',
   '_', 'E', 'x', 'c', 'e', 'p', 't', 'i', 'o', 'n', 0};
 const ACEXML_Char *ACEXML_SAXException::exception_name_ = ACEXML_SAXException_name;
 
+static const ACEXML_Char ACEXML_SAXNotSupportedException_name[] = {
+  'A', 'C', 'E', 'X', 'M', 'L',
+  'S', 'A', 'X',
+  'N', 'o', 't',
+  'S', 'u', 'p', 'p', 'o', 'r', 't', 'e', 'd',
+  '_', 'E', 'x', 'c', 'e', 'p', 't', 'i', 'o', 'n', 0};
+const ACEXML_Char *ACEXML_SAXNotSupportedException::exception_name_ = ACEXML_SAXNotSupportedException_name;
+
+static const ACEXML_Char ACEXML_SAXNotRecognizedException_name[] = {
+  'A', 'C', 'E', 'X', 'M', 'L',
+  'S', 'A', 'X',
+  'N', 'o', 't',
+  'R', 'e', 'c', 'o', 'g', 'n', 'i', 'z', 'e', 'd',
+  '_', 'E', 'x', 'c', 'e', 'p', 't', 'i', 'o', 'n', 0};
+const ACEXML_Char *ACEXML_SAXNotRecognizedException::exception_name_ = ACEXML_SAXNotRecognizedException_name;
+
+static const ACEXML_Char ACEXML_SAXParseException_name[] = {
+  'A', 'C', 'E', 'X', 'M', 'L',
+  'S', 'A', 'X',
+  'P', 'a', 'r', 's', 'e',
+  '_', 'E', 'x', 'c', 'e', 'p', 't', 'i', 'o', 'n', 0};
+const ACEXML_Char *ACEXML_SAXParseException::exception_name_ = ACEXML_SAXParseException_name;
+
+#if !defined (__ACEXML_INLINE__)
+# include "common/SAXExceptions.i"
+#endif /* __ACEXML_INLINE__ */
+
 ACEXML_SAXException::ACEXML_SAXException (void)
   : message_ (0)
 {
@@ -77,14 +100,6 @@ ACEXML_SAXException::print (void)
               this->message_));
 }
 
-static const ACEXML_Char ACEXML_SAXNotSupportedException_name[] = {
-  'A', 'C', 'E', 'X', 'M', 'L',
-  'S', 'A', 'X',
-  'N', 'o', 't',
-  'S', 'u', 'p', 'p', 'o', 'r', 't', 'e', 'd',
-  '_', 'E', 'x', 'c', 'e', 'p', 't', 'i', 'o', 'n', 0};
-const ACEXML_Char *ACEXML_SAXNotSupportedException::exception_name_ = ACEXML_SAXNotSupportedException_name;
-
 ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException (void)
 {
 }
@@ -138,14 +153,6 @@ ACEXML_SAXNotSupportedException::print (void)
               this->message_));
 }
 
-static const ACEXML_Char ACEXML_SAXNotRecognizedException_name[] = {
-  'A', 'C', 'E', 'X', 'M', 'L',
-  'S', 'A', 'X',
-  'N', 'o', 't',
-  'R', 'e', 'c', 'o', 'g', 'n', 'i', 'z', 'e', 'd',
-  '_', 'E', 'x', 'c', 'e', 'p', 't', 'i', 'o', 'n', 0};
-const ACEXML_Char *ACEXML_SAXNotRecognizedException::exception_name_ = ACEXML_SAXNotRecognizedException_name;
-
 ACEXML_SAXNotRecognizedException::ACEXML_SAXNotRecognizedException (void)
 {
 }
@@ -204,13 +211,6 @@ ACEXML_SAXNotRecognizedException::print (void)
               this->message_));
 }
 
-static const ACEXML_Char ACEXML_SAXParseException_name[] = {
-  'A', 'C', 'E', 'X', 'M', 'L',
-  'S', 'A', 'X',
-  'P', 'a', 'r', 's', 'e',
-  '_', 'E', 'x', 'c', 'e', 'p', 't', 'i', 'o', 'n', 0};
-const ACEXML_Char *ACEXML_SAXParseException::exception_name_ = ACEXML_SAXParseException_name;
-
 ACEXML_SAXParseException::ACEXML_SAXParseException (void)
 {
 }
diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp
index d3fa5092966..d48ddaa2869 100644
--- a/ACEXML/parser/parser/Parser.cpp
+++ b/ACEXML/parser/parser/Parser.cpp
@@ -4,6 +4,12 @@
 #include "common/Transcode.h"
 #include "common/AttributesImpl.h"
 
+static const ACEXML_Char default_attribute_type[] = {'C', 'D', 'A', 'T', 'A', 0};
+static const ACEXML_Char empty_string[] = { 0 };
+
+const ACEXML_Char
+ACEXML_Parser::simple_parsing_name_[] = { 'S', 'i', 'm', 'p', 'l', 'e', 0 };
+
 #if !defined (__ACEXML_INLINE__)
 # include "parser/parser/Parser.i"
 #endif /* __ACEXML_INLINE__ */
@@ -23,12 +29,6 @@ Make sure we are freezing the obstack in all cases.
 
 ***/
 
-static const ACEXML_Char default_attribute_type[] = {'C', 'D', 'A', 'T', 'A', 0};
-static const ACEXML_Char empty_string[] = { 0 };
-
-const ACEXML_Char
-ACEXML_Parser::simple_parsing_name_[] = { 'S', 'i', 'm', 'p', 'l', 'e', 0 };
-
 ACEXML_Parser::ACEXML_Parser (void)
   :   dtd_handler_ (0),
       entity_resolver_ (0),
diff --git a/ChangeLog b/ChangeLog
index 1fc875b34e4..91a16c8f9b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jan 25 14:40:15 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* XML/common/Exception.cpp:
+	* XML/common/NamespaceSupport.cpp:
+	* XML/common/SAXExceptions.cpp:
+	* XML/parser/parser/Parser.cpp: Moved the initialization of static
+	  members before the inclusion of inline files to avoid
+	  compilation erros on Borland compiler.  Thanks to Johnny
+	  Willemsen <jwillemsen@remedy.nl> for figuring this out.
+
 Fri Jan 25 14:31:06 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* XML/common/NamespaceSupport.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 1fc875b34e4..91a16c8f9b5 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Fri Jan 25 14:40:15 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* XML/common/Exception.cpp:
+	* XML/common/NamespaceSupport.cpp:
+	* XML/common/SAXExceptions.cpp:
+	* XML/parser/parser/Parser.cpp: Moved the initialization of static
+	  members before the inclusion of inline files to avoid
+	  compilation erros on Borland compiler.  Thanks to Johnny
+	  Willemsen <jwillemsen@remedy.nl> for figuring this out.
+
 Fri Jan 25 14:31:06 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* XML/common/NamespaceSupport.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 1fc875b34e4..91a16c8f9b5 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Fri Jan 25 14:40:15 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* XML/common/Exception.cpp:
+	* XML/common/NamespaceSupport.cpp:
+	* XML/common/SAXExceptions.cpp:
+	* XML/parser/parser/Parser.cpp: Moved the initialization of static
+	  members before the inclusion of inline files to avoid
+	  compilation erros on Borland compiler.  Thanks to Johnny
+	  Willemsen <jwillemsen@remedy.nl> for figuring this out.
+
 Fri Jan 25 14:31:06 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* XML/common/NamespaceSupport.cpp: