Merge branch '1.x' of ssh://authdev.it.ohio-state.edu/~scantor/git/cpp-xmltooling...

[shibboleth/cpp-xmltooling.git] / xmltooling / util / PathResolver.h

diff --git a/xmltooling/util/PathResolver.h b/xmltooling/util/PathResolver.h
index a6b6363..afafb80 100644 (file)
--- a/xmltooling/util/PathResolver.h
+++ b/xmltooling/util/PathResolver.h
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2009 Internet2
+/**
+ * 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.
  *
- * 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
+ * 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.
  */
 
 /**
@@ -106,12 +110,12 @@ namespace xmltooling {
          *
          * @param s         filename to resolve
          * @param filetype  type of file being resolved
-         * @param pkgname   application package name to use in resolving the file (or NULL for the default)
-         * @param prefix    installation prefix to use in resolving the file (or NULL for the default)
+         * @param pkgname   application package name to use in resolving the file (or nullptr for the default)
+         * @param prefix    installation prefix to use in resolving the file (or nullptr for the default)
          *
          * @return a const reference to the input string
          */
-        virtual const std::string& resolve(std::string& s, file_type_t filetype, const char* pkgname=NULL, const char* prefix=NULL) const;
+        virtual const std::string& resolve(std::string& s, file_type_t filetype, const char* pkgname=nullptr, const char* prefix=nullptr) const;
 
     private:
         bool isAbsolute(const char* s) const;