*** empty log message ***AX

2 files changed, 36 insertions, 41 deletions

diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp
index 2177dfd259e..949c265eacb 100644
--- a/ACEXML/common/NamespaceSupport.cpp
+++ b/ACEXML/common/NamespaceSupport.cpp
@@ -215,6 +215,9 @@ ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName,
                                        const ACEXML_Char *&name,
                                        int is_attribute) const
 {
+  // @@ Need to use different rules to resolve attributes.
+  ACE_UNUSED_ARG (is_attribute);
+
   int qlen = ACE_OS_String::strlen (qName);
   int len = -1;
   for (int i = 0; i < qlen; ++i)
diff --git a/ACEXML/common/XML_Types.h b/ACEXML/common/XML_Types.h
index 7568c0b22e2..bcb5edc6e21 100644
--- a/ACEXML/common/XML_Types.h
+++ b/ACEXML/common/XML_Types.h
@@ -14,22 +14,22 @@
 //=============================================================================
 
 #ifndef _ACEXML_XML_TYPES_H_
-#define _ACEXML_XML_TYPES_H_
-#include "ace/OS.h"
-#include "ace/SString.h"
-#include "common/ACEXML_Export.h"
+# define _ACEXML_XML_TYPES_H_
+# include "ace/OS.h"
+# include "ace/SString.h"
+# include "common/ACEXML_Export.h"
 
-#if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 2)
+# if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 2)
 typedef wchar_t ACEXML_UTF16;
-#else
+# else
 typedef ACE_USHORT16 ACEXML_UTF16;
-#endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 2 */
+# endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 2 */
 
-#if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 4)
+# if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 4)
 typedef wchar_t ACEXML_UCS4;
-#else
+# else
 typedef ACE_UINT32 ACEXML_UCS4;
-#endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 4 */
+# endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 4 */
 
 typedef char ACEXML_UTF8;
 
@@ -37,43 +37,35 @@ typedef char ACEXML_UTF8;
  * @typedef ACEXML_Char
  * ACEXML_Char only maps to ACEXML_UTF16 when ACE_USES_WCHAR is defined.
  * Here we assume sizeof (wchar_t) is always 2 bytes.
+ *
+ * Defulat XML strings will use UTF-8 encoding.  We would like to use
+ * the string classes in standard C++ Library here.  But they are not
+ * very portable yet (as far as I know,) and I'll just use ACE_CString
+ * for now, unless UNICODE support is turned on.  Notice that you
+ * should never convert strings between ACE_CString and ACE_WString
+ * using the built-in conversion functions as they only perform simple
+ * copy without any encoding conversion.
  */
-#if defined (ACE_USES_WCHAR)
+# if defined (ACE_USES_WCHAR)
 typedef ACEXML_UTF16 ACEXML_Char;
 typedef ACE_WString ACEXML_String;
-#else
+# else
 typedef ACEXML_UTF8 ACEXML_Char;
-typedef ACE_CString ACEXML_String
-#endif
-// Default XML character encoding.  We can change this to either
-// ACEXML_UTF8 or ACEXML_UTF16
-
-#if 0  // defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-typedef string ACEXML_String;
-//#else
 typedef ACE_CString ACEXML_String;
-// Defulat XML strings will use UTF-8 encoding.  We would like to use
-// the string classes in standard C++ Library here.  But they are not
-// very portable yet (as far as I know,) and I'll just use ACE_CString
-// for now.  Notice that you should never convert strings between
-// ACE_CString and ACE_WString using the built-in conversion functions
-// as they only perform simple copy without any encoding conversion.
-#endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
+# endif /* ACE_USES_WCHAR */
 
-#if (!defined (ACEXML_HAS_INLINE) && defined (__ACE_INLINE__)) ||  (ACEXML_HAS_INLINE == 1)
-#  define __ACEXML_INLINE__ inline
-#else
-# if defined (__ACEXML_INLINE__)
-#   undefine __ACEXML_INLINE__
-# endif /* __ACEXML_INLINE__ */
-#endif /* (!ACEXML_HAS_INLINE) && (__ACE_INLINE__) || (ACEXML_HAS_INLINE == 1) */
+# if (!defined (ACEXML_HAS_INLINE) && defined (__ACE_INLINE__)) ||  (ACEXML_HAS_INLINE == 1)
+#   define __ACEXML_INLINE__ inline
+# else
+#   if defined (__ACEXML_INLINE__)
+#     undefine __ACEXML_INLINE__
+#   endif /* __ACEXML_INLINE__ */
+# endif /* (!ACEXML_HAS_INLINE) && (__ACE_INLINE__) || (ACEXML_HAS_INLINE == 1) */
 
-#if defined (__ACEXML_INLINE__)
-# define ACEXML_INLINE inline
-#else
-# define ACEXML_INLINE
-#endif /* __ACEXML_INLINE */
+# if defined (__ACEXML_INLINE__)
+#   define ACEXML_INLINE inline
+# else
+#   define ACEXML_INLINE
+# endif /* __ACEXML_INLINE */
 
-// As we always assume sizeof<char> on all platforms are 1 byte long,
-// so char == UTF8 char, and there is no need to define it again.
 #endif /* _ACEXML_XML_TYPE_H_ */