X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=blobdiff_plain;f=xmltooling%2Fexceptions.h;h=c04c8702c3022b69c29447d592795fce35a89ed3;hp=7ed53d79f463031c78e9916f629f197080b26a56;hb=HEAD;hpb=30654333446e3148ff35914b2fe087da0719889b

diff --git a/xmltooling/exceptions.h b/xmltooling/exceptions.h
index 7ed53d7..c04c870 100644
--- a/xmltooling/exceptions.h
+++ b/xmltooling/exceptions.h
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2009 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
@@ -44,7 +48,7 @@
     class linkage name : public base { \
     public: \
         XMLTOOLING_DOXYGEN(Constructor) \
-        name(const char* msg=NULL, const xmltooling::params& p=xmltooling::params()) : base(msg,p) {} \
+        name(const char* msg=nullptr, const xmltooling::params& p=xmltooling::params()) : base(msg,p) {} \
         XMLTOOLING_DOXYGEN(Constructor) \
         name(const char* msg, const xmltooling::namedparams& p) : base(msg,p) {} \
         XMLTOOLING_DOXYGEN(Constructor) \
@@ -148,7 +152,7 @@ namespace xmltooling {
          * @param msg   error message
          * @param p     an ordered set of positional parameter strings
          */
-        XMLToolingException(const char* msg=NULL, const params& p=params());
+        XMLToolingException(const char* msg=nullptr, const params& p=params());
 
         /**
          * Constructs an exception using a message and named parameters.
@@ -241,7 +245,7 @@ namespace xmltooling {
          * Returns the parameter property with the designated position (based from one).
          * 
          * @param index     position to access
-         * @return  the parameter property or NULL
+         * @return  the parameter property or nullptr
          */
         const char* getProperty(unsigned int index) const;
 
@@ -249,7 +253,7 @@ namespace xmltooling {
          * Returns the parameter property with the designated name.
          * 
          * @param name     named parameter to access
-         * @return  the parameter property or NULL
+         * @return  the parameter property or nullptr
          */
         const char* getProperty(const char* name) const;