projects
/
shibboleth
/
cpp-opensaml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reducing header overuse, non-inlining selected methods (CPPOST-35).
[shibboleth/cpp-opensaml.git]
/
samltest
/
internal.h
diff --git
a/samltest/internal.h
b/samltest/internal.h
index
5dddfa1
..
753943b
100644
(file)
--- a/
samltest/internal.h
+++ b/
samltest/internal.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2001-200
6
Internet2
+ * Copyright 2001-200
9
Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-14,23
+14,26
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#ifdef WIN32
\r
-# define _CRT_SECURE_NO_DEPRECATE 1
\r
-# define _CRT_NONSTDC_NO_DEPRECATE 1
\r
-#endif
\r
+#ifdef WIN32
+# define _CRT_SECURE_NO_DEPRECATE 1
+# define _CRT_NONSTDC_NO_DEPRECATE 1
+#endif
#include <cxxtest/TestSuite.h>
#include <cxxtest/TestSuite.h>
-#include <fstream>
#include <saml/exceptions.h>
#include <saml/util/SAMLConstants.h>
#include <saml/exceptions.h>
#include <saml/util/SAMLConstants.h>
+
+#include <fstream>
#include <xmltooling/XMLObject.h>
#include <xmltooling/XMLObjectBuilder.h>
#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/XMLObject.h>
#include <xmltooling/XMLObjectBuilder.h>
#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/util/DateTime.h>
+#include <xmltooling/util/ParserPool.h>
#include <xmltooling/validation/Validator.h>
#include <xmltooling/validation/Validator.h>
-using namespace opensaml;
using namespace xmltooling;
using namespace xmltooling;
+using namespace xercesc;
using namespace std;
extern string data_path;
using namespace std;
extern string data_path;
@@
-155,7
+158,7
@@
class SAMLObjectValidatorBaseTestCase : virtual public SAMLObjectBaseTestCase {
XMLObject* target;
/** QName of the object to be tested */
XMLObject* target;
/** QName of the object to be tested */
- QName targetQName;
+
xmltooling::
QName targetQName;
/** Builder for XMLObjects of type targetQName */
const XMLObjectBuilder* builder;
/** Builder for XMLObjects of type targetQName */
const XMLObjectBuilder* builder;
@@
-225,7
+228,7
@@
class SAMLObjectValidatorBaseTestCase : virtual public SAMLObjectBaseTestCase {
* @param targetQName QName of the type of object to build
* @returns new XMLObject of type targetQName
*/
* @param targetQName QName of the type of object to build
* @returns new XMLObject of type targetQName
*/
- XMLObject* buildXMLObject(QName &targetQName) {
+ XMLObject* buildXMLObject(
xmltooling::
QName &targetQName) {
// Create the builder on the first request only, for efficiency
if (builder == NULL) {
builder = XMLObjectBuilder::getBuilder(targetQName);
// Create the builder on the first request only, for efficiency
if (builder == NULL) {
builder = XMLObjectBuilder::getBuilder(targetQName);