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 6c5a970..6ad72a6 100644 (file)
--- a/xmltooling/util/NDC.h
+++ b/xmltooling/util/NDC.h
@@ -1,31 +1,36 @@
-/*
- *  Copyright 2001-2007 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.
  */
 
 /**
- * @file NDC.h
+ * @file xmltooling/util/NDC.h
  * 
  * Diagnostic context for logging 
  */
 
-#if !defined(__xmltooling_ndc_h__)
+#ifndef __xmltooling_ndc_h__
 #define __xmltooling_ndc_h__
 
-#include <string>
 #include <xmltooling/base.h>
 
+#include <string>
+
 namespace xmltooling {
     
     /**
@@ -33,6 +38,7 @@ namespace xmltooling {
      */
     class XMLTOOL_API NDC
     {
+    MAKE_NONCOPYABLE(NDC);
     public:
         /**
          * Constructor pushes logging context onto diagnostic stack
@@ -50,8 +56,6 @@ namespace xmltooling {
          * Destructor pops context off of diagnostic stack
          */
         ~NDC();
-        
-    MAKE_NONCOPYABLE(NDC);
     };
 
 };