Imported Upstream version 0.3.4

[anytun.git] / src / log.h

diff --git a/src/log.h b/src/log.h
index dcdedc4..12c723d 100644 (file)
--- a/src/log.h
+++ b/src/log.h
@@ -11,14 +11,15 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
  *
  *  Anytun is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
  *
  *  Anytun is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,8 +30,8 @@
  *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LOG_H_
-#define _LOG_H_
+#ifndef ANYTUN_log_h_INCLUDED
+#define ANYTUN_log_h_INCLUDED
 
 #include <string>
 #include <sstream>
@@ -40,7 +41,7 @@
 
 class Log;
 
-class LogStringBuilder 
+class LogStringBuilder
 {
 public:
   LogStringBuilder(LogStringBuilder const& src);
@@ -76,15 +77,18 @@ public:
 private:
   Log() {};
   ~Log() {};
-  Log(const Log &l);
-  void operator=(const Log &l);
+  Log(const Log& l);
+  void operator=(const Log& l);
 
   static Log* inst;
   static Mutex instMutex;
-  class instanceCleaner {
-    public: ~instanceCleaner() {
-      if(Log::inst != 0)
+  class instanceCleaner
+  {
+  public:
+    ~instanceCleaner() {
+      if(Log::inst != 0) {
         delete Log::inst;
+      }
     }
   };
   friend class instanceCleaner;