Convert from NULL macro to nullptr.

[shibboleth/cpp-xmltooling.git] / xmltooling / soap / OpenSSLSOAPTransport.h

diff --git a/xmltooling/soap/OpenSSLSOAPTransport.h b/xmltooling/soap/OpenSSLSOAPTransport.h
index 6cd0369..eecb289 100644 (file)
--- a/xmltooling/soap/OpenSSLSOAPTransport.h
+++ b/xmltooling/soap/OpenSSLSOAPTransport.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.
@@ -20,7 +20,7 @@
  * Encapsulates OpenSSL-capable SOAP transport layer.
  */
 
-#ifndef __xmltooling_opensslsoaptrans_h__
+#if !defined(__xmltooling_opensslsoaptrans_h__) && !defined(XMLTOOLING_NO_XMLSEC)
 #define __xmltooling_opensslsoaptrans_h__
 
 #include <xmltooling/soap/SOAPTransport.h>
@@ -35,9 +35,9 @@ namespace xmltooling {
     class XMLTOOL_API OpenSSLSOAPTransport : public virtual SOAPTransport 
     {
     protected:
-        OpenSSLSOAPTransport() {}
+        OpenSSLSOAPTransport();
     public:
-        virtual ~OpenSSLSOAPTransport() {}
+        virtual ~OpenSSLSOAPTransport();
         
         /** OpenSSL context callback for manipulating credentials and validation behavior. */
         typedef bool (*ssl_ctx_callback_fn)(OpenSSLSOAPTransport* transport, SSL_CTX* ssl_ctx, void* userptr);
@@ -49,14 +49,14 @@ namespace xmltooling {
          * @param userptr   a caller-supplied value to pass to the callback function
          * @return true iff the callback was set
          */
-        virtual bool setSSLCallback(ssl_ctx_callback_fn fn, void* userptr=NULL)=0;
+        virtual bool setSSLCallback(ssl_ctx_callback_fn fn, void* userptr=nullptr)=0;
         
         /**
          * Sets indicator that the transport peer has been authenticated.
          * 
-         * @param secure    flag to set
+         * @param auth    flag to set
          */
-        virtual void setSecure(bool secure)=0;
+        virtual void setAuthenticated(bool auth)=0;
     };
 
 };