Reducing header overuse, non-inlining selected methods (CPPOST-35).

git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/branches/REL_1@658 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/xmltooling/XMLObjectBuilder.h b/xmltooling/XMLObjectBuilder.h
index ef54e17..7592dc7 100644 (file)
--- a/xmltooling/XMLObjectBuilder.h
+++ b/xmltooling/XMLObjectBuilder.h
@@ -1,5 +1,5 @@
 /*\r
- *  Copyright 2001-2007 Internet2\r
+ *  Copyright 2001-2009 Internet2\r
  * \r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -23,12 +23,13 @@
 #ifndef __xmltooling_xmlobjbuilder_h__\r
 #define __xmltooling_xmlobjbuilder_h__\r
 \r
-#include <map>\r
-#include <memory>\r
 #include <xmltooling/QName.h>\r
 #include <xmltooling/XMLObject.h>\r
 #include <xmltooling/util/XMLHelper.h>\r
 \r
+#include <map>\r
+#include <memory>\r
+\r
 #if defined (_MSC_VER)\r
     #pragma warning( push )\r
     #pragma warning( disable : 4250 4251 )\r

diff --git a/xmltooling/util/XMLConstants.h b/xmltooling/util/XMLConstants.h
index 89caa0e..e012b70 100644 (file)
--- a/xmltooling/util/XMLConstants.h
+++ b/xmltooling/util/XMLConstants.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,14 @@
 /**
  * @file xmltooling/util/XMLConstants.h
  * 
- * Fundamental XML namespace constants 
+ * Fundamental XML namespace constants.
  */
 
 #ifndef __xmltooling_xmlconstants_h__
 #define __xmltooling_xmlconstants_h__
 
-#include <xmltooling/unicode.h>
+#include <xmltooling/base.h>
+#include <xercesc/util/XercesDefs.hpp>
 
 /**
  * XML related constants.