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

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

diff --git a/xmltooling/util/NDC.h b/xmltooling/util/NDC.h
index 9d5714c..6ad72a6 100644 (file)
--- a/xmltooling/util/NDC.h
+++ b/xmltooling/util/NDC.h
@@ -1,59 +1,63 @@
-/*\r
- *  Copyright 2001-2006 Internet2\r
- * \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-/**\r
- * @file NDC.h\r
- * \r
- * Diagnostic context for logging \r
- */\r
-\r
-#if !defined(__xmltooling_ndc_h__)\r
-#define __xmltooling_ndc_h__\r
-\r
-#include <string>\r
-#include <xmltooling/base.h>\r
-\r
-namespace xmltooling {\r
-    \r
-    /**\r
-     * A portable stack-based context for diagnostic logging \r
-     */\r
-    class XMLTOOL_API NDC\r
-    {\r
-    public:\r
-        /**\r
-         * Constructor pushes logging context onto diagnostic stack\r
-         * @param context   null-terminated label for context\r
-         */\r
-        NDC(const char* context);\r
-\r
-        /**\r
-         * Constructor pushes logging context onto diagnostic stack\r
-         * @param context   string label for context\r
-         */\r
-        NDC(const std::string& context);\r
-        \r
-        /**\r
-         * Destructor pops context off of diagnostic stack\r
-         */\r
-        ~NDC();\r
-        \r
-    MAKE_NONCOPYABLE(NDC);\r
-    };\r
-\r
-};\r
-\r
-#endif /* __xmltooling_ndc_h__ */\r
+/**
+ * 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
+ *
+ * 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.
+ */
+
+/**
+ * @file xmltooling/util/NDC.h
+ * 
+ * Diagnostic context for logging 
+ */
+
+#ifndef __xmltooling_ndc_h__
+#define __xmltooling_ndc_h__
+
+#include <xmltooling/base.h>
+
+#include <string>
+
+namespace xmltooling {
+    
+    /**
+     * A portable stack-based context for diagnostic logging 
+     */
+    class XMLTOOL_API NDC
+    {
+    MAKE_NONCOPYABLE(NDC);
+    public:
+        /**
+         * Constructor pushes logging context onto diagnostic stack
+         * @param context   null-terminated label for context
+         */
+        NDC(const char* context);
+
+        /**
+         * Constructor pushes logging context onto diagnostic stack
+         * @param context   string label for context
+         */
+        NDC(const std::string& context);
+        
+        /**
+         * Destructor pops context off of diagnostic stack
+         */
+        ~NDC();
+    };
+
+};
+
+#endif /* __xmltooling_ndc_h__ */