Changeset 6387 for code/branches/presentation2/src/libraries/network/synchronisable

Timestamp:

Dec 21, 2009, 1:18:36 PM (15 years ago)

Author:

rgrieder

Message:

Found some non empty new lines.

Location:

code/branches/presentation2/src/libraries/network/synchronisable

Files:

• NetworkCallback.h (modified) (2 diffs)
• NetworkCallbackManager.cc (modified) (2 diffs)
• NetworkCallbackManager.h (modified) (2 diffs)
• Synchronisable.cc (modified) (3 diffs)
• Synchronisable.h (modified) (4 diffs)
• SynchronisableVariable.h (modified) (6 diffs)

code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallback.h

@@ -36 +36 @@
 
 namespace orxonox{
-  
+
   struct EmptyType{};
-  
+
   class _NetworkExport NetworkCallbackBase
   {
@@ -60 +60 @@
       void (T::*function_) (void);
   };
-  
+
   template <class T, class U>
   class NetworkCallbackNotify: public NetworkCallbackBase

code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc

@@ -26 +26 @@
  *
  */
- 
+
 #include "NetworkCallbackManager.h"
 #include "NetworkCallback.h"
 
 namespace orxonox{
-  
+
   std::set<NetworkCallbackBase*> NetworkCallbackManager::callbackSet_;
   std::queue<NetworkCallbackBase*> NetworkCallbackManager::triggeredCallbacks_;
-  
+
   void NetworkCallbackManager::registerCallback(NetworkCallbackBase *cb)
   { 
@@ -48 +48 @@
     }
   }
-  
+
   void NetworkCallbackManager::triggerCallback(NetworkCallbackBase *cb)
   {

code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.h

@@ -37 +37 @@
 
 namespace orxonox{
-  
+
   class _NetworkExport NetworkCallbackManager{
     public:
@@ -48 +48 @@
       static std::queue<NetworkCallbackBase*> triggeredCallbacks_;
   };
-  
+
 
 }

code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.cc

@@ -62 +62 @@
     }
     classID_ = static_cast<uint32_t>(-1);
-    
+
     // set dataSize to 0
     this->dataSize_ = 0;
@@ -277 +277 @@
       //tempsize += (*i)->getSize( mode );
     }
-    
+
     tempsize += SynchronisableHeader::getSize();
     header.setObjectID( this->objectID_ );
@@ -284 +284 @@
     header.setDataAvailable( true );
     header.setDataSize( tempsize );
-    
+
 #ifndef NDEBUG
     uint32_t size;

code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h

@@ -132 +132 @@
     inline unsigned int getPriority() const { return this->objectFrequency_;}
     inline uint8_t getSyncMode() const { return this->objectMode_; }
-    
+
     void setSyncMode(uint8_t mode);
 
@@ -138 +138 @@
     Synchronisable(BaseObject* creator);
     template <class T> void registerVariable(T& variable, uint8_t mode=0x1, NetworkCallbackBase *cb=0, bool bidirectional=false);
-    
+
     void setPriority(unsigned int freq){ objectFrequency_ = freq; }
 
@@ -148 +148 @@
     bool isMyData(uint8_t* mem);
     bool doSync(int32_t id, uint8_t mode=0x0);
-    
+
     inline void setObjectID(uint32_t id){ this->objectID_ = id; objectMap_[this->objectID_] = this; }
     inline void setClassID(uint32_t id){ this->classID_ = id; }
@@ -181 +181 @@
     }
   }
-  
+
   template <> _NetworkExport void Synchronisable::registerVariable( std::string& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional);
 
-  
+
 }
 

code/branches/presentation2/src/libraries/network/synchronisable/SynchronisableVariable.h

@@ -41 +41 @@
 
 namespace orxonox{
-  
+
   namespace VariableDirection{
     enum Value{
@@ -54 +54 @@
     };
   }
-  
+
   class _NetworkExport SynchronisableVariableBase
   {
@@ -85 +85 @@
       NetworkCallbackBase      *callback_;
   };
-  
+
   template <class T>
   class SynchronisableVariableBidirectional: public SynchronisableVariable<T>
@@ -92 +92 @@
       SynchronisableVariableBidirectional(T& variable, uint8_t master=Bidirectionality::ServerMaster, NetworkCallbackBase *cb=0);
       virtual ~SynchronisableVariableBidirectional();
-      
+
       virtual inline uint8_t getMode(){ return 0x3; } //this basically is a hack ^^
       virtual inline uint32_t getData(uint8_t*& mem, uint8_t mode);
@@ -112 +112 @@
     }
   }
-  
+
   template <class T> SynchronisableVariable<T>::~SynchronisableVariable()
   {
@@ -253 +253 @@
       return returnSize( this->variable_ ) + sizeof(varReference_);
     }
-  
+
 
 }