Imported Upstream version 0.3.4

[anytun.git] / src / syncQueue.h

diff --git a/src/syncQueue.h b/src/syncQueue.h
index 5cb4f6e..e5eb8d7 100644 (file)
--- a/src/syncQueue.h
+++ b/src/syncQueue.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 _SYNC_QUEUE_H
-#define _SYNC_QUEUE_H
+#ifndef ANYTUN_syncQueue_h_INCLUDED
+#define ANYTUN_syncQueue_h_INCLUDED
 
 #include <deque>
 #include <queue>
@@ -44,28 +45,31 @@
 class SyncQueue
 {
 public:
-       SyncQueue():syncServer_(NULL) {};
-       ~SyncQueue() {};
+  SyncQueue():syncServer_(NULL) {};
+  ~SyncQueue() {};
   static SyncQueue& instance();
-       void setSyncServerPtr(SyncServer *);
-       void push(const std::string & );
-       void push(const SyncCommand & );
-       std::string pop();
-       bool empty();
+  void setSyncServerPtr(SyncServer*);
+  void push(const std::string&);
+  void push(const SyncCommand&);
+  std::string pop();
+  bool empty();
 
 private:
   static Mutex instMutex;
-       static SyncQueue* inst;
-  class instanceCleaner {
-    public: ~instanceCleaner() {
-     if(SyncQueue::inst != 0)
-       delete SyncQueue::inst;
-   }
+  static SyncQueue* inst;
+  class instanceCleaner
+  {
+  public:
+    ~instanceCleaner() {
+      if(SyncQueue::inst != 0) {
+        delete SyncQueue::inst;
+      }
+    }
   };
-  SyncQueue(const SyncQueue &s);
-  void operator=(const SyncQueue &s);
+  SyncQueue(const SyncQueue& s);
+  void operator=(const SyncQueue& s);
   Mutex mutex_;
-       SyncServer * syncServer_;
+  SyncServer* syncServer_;
 };
 
 extern SyncQueue& gSyncQueue;