Changeset 10994 for code/branches/cpp11_v2/src/libraries/network
- Timestamp:
- Dec 29, 2015, 5:36:14 PM (9 years ago)
- Location:
- code/branches/cpp11_v2/src/libraries/network
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h
r10845 r10994 45 45 46 46 #if defined(ORXONOX_COMPILER_GCC) && defined(ORXONOX_ARCH_32) 47 static const unsigned int MAX_FUNCTION_POINTER_SIZE = 8;47 static constexpr unsigned int MAX_FUNCTION_POINTER_SIZE = 8; 48 48 #else 49 static const unsigned int MAX_FUNCTION_POINTER_SIZE = 16;49 static constexpr unsigned int MAX_FUNCTION_POINTER_SIZE = 16; 50 50 #endif //ORXONOX_COMPILER_GCC 51 static const unsigned int MAX_FUNCTION_POINTER_INTS = (MAX_FUNCTION_POINTER_SIZE-1)/4+1;51 static constexpr unsigned int MAX_FUNCTION_POINTER_INTS = (MAX_FUNCTION_POINTER_SIZE-1)/4+1; 52 52 53 53 struct _NetworkExport NetworkFunctionPointer { -
code/branches/cpp11_v2/src/libraries/network/NetworkPrereqs.h
r10624 r10994 67 67 namespace orxonox 68 68 { 69 static const unsigned int GAMESTATEID_INITIAL = static_cast<unsigned int>(-1);69 static constexpr unsigned int GAMESTATEID_INITIAL = static_cast<unsigned int>(-1); 70 70 extern const char* LAN_DISCOVERY_MESSAGE; 71 71 extern const char* LAN_DISCOVERY_ACK; 72 static const unsigned int LAN_DISCOVERY_PORT = 55558;73 static const unsigned int NETWORK_PEER_ID_SERVER = 0;74 static const unsigned int NETWORK_PEER_ID_BROADCAST = static_cast<unsigned int>(-1);75 static const unsigned int NETWORK_PEER_ID_UNKNOWN = static_cast<unsigned int>(-2);76 static const unsigned int NETWORK_CHANNEL_DEFAULT = 0;77 static const unsigned int NETWORK_CHANNEL_UNRELIABLE = 1;78 static const unsigned int NETWORK_CHANNEL_COUNT = 2;72 static constexpr unsigned int LAN_DISCOVERY_PORT = 55558; 73 static constexpr unsigned int NETWORK_PEER_ID_SERVER = 0; 74 static constexpr unsigned int NETWORK_PEER_ID_BROADCAST = static_cast<unsigned int>(-1); 75 static constexpr unsigned int NETWORK_PEER_ID_UNKNOWN = static_cast<unsigned int>(-2); 76 static constexpr unsigned int NETWORK_CHANNEL_DEFAULT = 0; 77 static constexpr unsigned int NETWORK_CHANNEL_UNRELIABLE = 1; 78 static constexpr unsigned int NETWORK_CHANNEL_COUNT = 2; 79 79 } 80 80 -
code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc
r10775 r10994 38 38 namespace orxonox { 39 39 40 static const unsigned int SCHED_PRIORITY_OFFSET = static_cast<unsigned int>(-1);40 static constexpr unsigned int SCHED_PRIORITY_OFFSET = static_cast<unsigned int>(-1); 41 41 namespace arg = std::placeholders; 42 42 -
code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h
r10817 r10994 48 48 { 49 49 50 static const uint8_t GAMESTATE_MODE_SERVER = 0x1;51 static const uint8_t GAMESTATE_MODE_CLIENT = 0x2;50 static constexpr uint8_t GAMESTATE_MODE_SERVER = 0x1; 51 static constexpr uint8_t GAMESTATE_MODE_CLIENT = 0x2; 52 52 53 53 class _NetworkExport GamestateHeader
Note: See TracChangeset
for help on using the changeset viewer.