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

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

diff --git a/samltest/saml2/core/impl/SubjectLocality20Test.h b/samltest/saml2/core/impl/SubjectLocality20Test.h
index 666bdac..d5c3287 100644 (file)
--- a/samltest/saml2/core/impl/SubjectLocality20Test.h
+++ b/samltest/saml2/core/impl/SubjectLocality20Test.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.
@@ -43,13 +43,13 @@ public:
     void testSingleElementUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         SubjectLocality* sl = dynamic_cast<SubjectLocality*>(xo.get());
-        TS_ASSERT(sl!=NULL);
+        TS_ASSERT(sl!=nullptr);
     }
 
     void testSingleElementOptionalAttributesUnmarshall() {
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));
         SubjectLocality* sl = dynamic_cast<SubjectLocality*>(xo.get());
-        TS_ASSERT(sl!=NULL);
+        TS_ASSERT(sl!=nullptr);
         assertEquals("Address attribute", expectedAddress, sl->getAddress());
         assertEquals("DNSName attribute", expectedDNSName, sl->getDNSName());
     }