Changeset 2171 for code/trunk/src/network/packet/Packet.h
- Timestamp:
- Nov 10, 2008, 12:05:03 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/objecthierarchy merged: 2111-2115,2123,2132-2134,2143-2144,2153-2158,2160-2169
- Property svn:mergeinfo changed
-
code/trunk/src/network/packet/Packet.h
r2087 r2171 29 29 #define NETWORKPACKET_H 30 30 31 #include " ../NetworkPrereqs.h"31 #include "network/NetworkPrereqs.h" 32 32 33 33 #include <map> 34 34 #include <enet/enet.h> 35 #include <boost/thread/recursive_mutex.hpp> 35 36 36 37 #include "util/Integers.h" 37 38 38 namespace network{39 namespace orxonox { 39 40 40 41 namespace packet{ … … 92 93 bool bDataENetAllocated_; 93 94 private: 94 static std::map<ENetPacket *, Packet *> packetMap_; 95 static std::map<size_t, Packet *> packetMap_; 96 //! Static mutex for any packetMap_ access 97 static boost::recursive_mutex packetMap_mutex; 95 98 ENetPacket *enetPacket_; 96 99 }; … … 98 101 } //namespace packet 99 102 100 } //namespace network103 } //namespace orxonox 101 104 102 105 #endif
Note: See TracChangeset
for help on using the changeset viewer.