XERCESC-2208: Add special cases for C++11 character types

src/xercesc/util/BitOps.hpp

@@ -38,6 +38,12 @@ public:
         return XMLCh(((toSwap >> 8) | (toSwap << 8)) & 0xFFFF);
     }
 
+    static inline UTF16Ch swapBytes(const UTF16Ch toSwap)
+    {
+        //The mask is required to overcome a compiler error on solaris
+        return XMLCh(((toSwap >> 8) | (toSwap << 8)) & 0xFFFF);
+    }
+
     static inline unsigned int swapBytes(const XMLUInt32 toSwap)
     {
         return
@@ -49,6 +55,16 @@ public:
         );
     }
 
+    static inline UCS4Ch swapBytes(const UCS4Ch toSwap)
+    {
+        return
+        (
+            (toSwap >> 24)
+            | (toSwap << 24)
+            | ((toSwap & 0xFF00) << 8)
+            | ((toSwap & 0xFF0000) >> 8)
+        );
+    }
 
 
 protected :

src/xercesc/util/XMLUTF16Transcoder.cpp

@@ -156,7 +156,7 @@ XMLUTF16Transcoder::transcodeTo(const   XMLCh* const    srcData
         for (XMLSize_t index = 0; index < countToDo; index++)
         {
             // To avoid flakey compilers, use a temp
-            const UTF16Ch tmpCh = UTF16Ch(*srcPtr++);
+            const UTF16Ch tmpCh = static_cast<UTF16Ch>(*srcPtr++);
             *outPtr++ = BitOps::swapBytes(tmpCh);
         }
     }