[Mobies-commit] [commit] r3679 - in UDM/trunk: include src/UdmDom

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Mar 25 16:00:50 2011
New Revision: 3679

Log:
Changes to allow us to not include the xerces-c headers in the distribution

Modified:
   UDM/trunk/include/UdmDom.h
   UDM/trunk/src/UdmDom/UdmDom.cpp

Modified: UDM/trunk/include/UdmDom.h
==============================================================================
--- UDM/trunk/include/UdmDom.h	Fri Mar 25 14:58:09 2011	(r3678)
+++ UDM/trunk/include/UdmDom.h	Fri Mar 25 16:00:50 2011	(r3679)
@@ -34,7 +34,15 @@
 #include <UdmBase.h>
 #endif
 
+#if defined(_WIN32) && !defined(XERCES_CPP_NAMESPACE_BEGIN)
+// These defines allow us to not distribute xerces-c headers
+#define XERCES_CPP_NAMESPACE_BEGIN namespace xercesc_2_8 {
+#define XERCES_CPP_NAMESPACE_END }
+#define XERCES_CPP_NAMESPACE_USE using namespace xercesc_2_8;
+typedef wchar_t  XMLCh;
+#else
 #include "xercesc/util/PlatformUtils.hpp"
+#endif
 
 //these predefinitions are needed for typedefs
 

Modified: UDM/trunk/src/UdmDom/UdmDom.cpp
==============================================================================
--- UDM/trunk/src/UdmDom/UdmDom.cpp	Fri Mar 25 14:58:09 2011	(r3678)
+++ UDM/trunk/src/UdmDom/UdmDom.cpp	Fri Mar 25 16:00:50 2011	(r3679)
@@ -192,7 +192,6 @@
 #include <fstream>
 
 
-#include "UdmDom.h"
 #include "Uml.h"
 #include "UmlExt.h"
 #include "UdmUtil.h"
@@ -216,7 +215,9 @@
 #include <xercesc/framework/MemBufInputSource.hpp>
 #include <xercesc/framework/MemBufFormatTarget.hpp>
 #include <xercesc/sax/HandlerBase.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
 
+#include "UdmDom.h"
 
 #ifdef max
 #undef max