Convert from NULL macro to nullptr, remove unused zlib code.

[shibboleth/cpp-opensaml.git] / samltest / saml2 / core / impl / Action20Test.h

diff --git a/samltest/saml2/core/impl/Action20Test.h b/samltest/saml2/core/impl/Action20Test.h
index 2217b64..223c657 100644 (file)
--- a/samltest/saml2/core/impl/Action20Test.h
+++ b/samltest/saml2/core/impl/Action20Test.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         Action* action = dynamic_cast<Action*>(xo.get());
-        TS_ASSERT(action!=NULL);
+        TS_ASSERT(action!=nullptr);
 
         assertEquals("Element content", expectedContent, action->getAction());
         assertEquals("Namespace attribute", expectedNamespace, action->getNamespace());
@@ -51,7 +51,7 @@ public:
 
     void testSingleElementMarshall() {
         Action* action = ActionBuilder::buildAction();
-        TS_ASSERT(action!=NULL);
+        TS_ASSERT(action!=nullptr);
 
         action->setAction(expectedContent);
         action->setNamespace(expectedNamespace);