Imported Upstream version 0.3.4

[anytun.git] / src / syncBuffer.h

diff --git a/src/syncBuffer.h b/src/syncBuffer.h
index f5e2ff5..b68e9f5 100644 (file)
--- a/src/syncBuffer.h
+++ b/src/syncBuffer.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 _SYNCBUFFER_H_
-#define _SYNCBUFFER_H_
+#ifndef ANYTUN_syncBuffer_h_INCLUDED
+#define ANYTUN_syncBuffer_h_INCLUDED
 
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/archive/text_iarchive.hpp>
@@ -42,23 +43,23 @@
 class SyncBuffer : public Buffer
 {
 public:
-               SyncBuffer() : Buffer(){};
-               SyncBuffer(u_int32_t length) : Buffer(length){};
-               SyncBuffer(Buffer b): Buffer(b) {};
-               SyncBuffer(u_int8_t* data, u_int32_t length): Buffer(data,length) {};
-               SyncBuffer(const SyncBuffer & src) : Buffer(src) {};
+  SyncBuffer() : Buffer() {};
+  SyncBuffer(uint32_t length) : Buffer(length) {};
+  SyncBuffer(Buffer b): Buffer(b) {};
+  SyncBuffer(uint8_t* data, uint32_t length): Buffer(data,length) {};
+  SyncBuffer(const SyncBuffer& src) : Buffer(src) {};
 private:
-//TODO check if this is ok
-//  Mutex mutex_;
-       friend class boost::serialization::access;
-       template<class Archive>
-       void serialize(Archive & ar, const unsigned int version)
-       {
-//             Lock lock(mutex_);
-    ar & length_;
-               for(u_int32_t i = 0; i < length_; i++)
-                       ar & (*this)[i];
-       }
+  //TODO check if this is ok
+  //  Mutex mutex_;
+  friend class boost::serialization::access;
+  template<class Archive>
+  void serialize(Archive& ar, const unsigned int version) {
+    //         Lock lock(mutex_);
+    ar& length_;
+    for(uint32_t i = 0; i < length_; i++) {
+      ar & (*this)[i];
+    }
+  }
 };
 
 #endif