X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=samltest%2Finternal.h;h=05eeb7ea9fe2456cc0d69849c9308dd016f970e0;hb=837908fd524b6bf22d08436791a07315ab9edfbf;hp=4575bc425603f3255bf264465a83fe5ae8ab92ff;hpb=a1fc8349ebc40c9dae9f50ca264efad71071bda8;p=shibboleth%2Fcpp-opensaml.git

diff --git a/samltest/internal.h b/samltest/internal.h
index 4575bc4..05eeb7e 100644
--- a/samltest/internal.h
+++ b/samltest/internal.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2007 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,23 @@
  * limitations under the License.
  */
 
+#ifdef WIN32
+# define _CRT_SECURE_NO_DEPRECATE 1
+# define _CRT_NONSTDC_NO_DEPRECATE 1
+#endif
+
 #include <cxxtest/TestSuite.h>
 
 #include <fstream>
 #include <saml/exceptions.h>
-#include <saml/SAMLConfig.h>
 #include <saml/util/SAMLConstants.h>
-#include <xmltooling/exceptions.h>
-#include <xmltooling/validation/Validator.h>
 #include <xmltooling/XMLObject.h>
 #include <xmltooling/XMLObjectBuilder.h>
+#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/validation/Validator.h>
 
-using namespace opensaml;
 using namespace xmltooling;
+using namespace xercesc;
 using namespace std;
 
 extern string data_path;
@@ -102,10 +106,10 @@ protected:
         char* buf = NULL;
         if (!XMLString::equals(expectedString, testString)) {
             buf = XMLString::transcode(testString);
-            TS_TRACE(buf);
+            TS_TRACE(buf ? buf : "(NULL)");
             XMLString::release(&buf);
             buf = XMLString::transcode(expectedString);
-            TS_TRACE(buf);
+            TS_TRACE(buf ? buf : "(NULL)");
             XMLString::release(&buf);
             TSM_ASSERT(failMessage, false);
         }