diff --git a/external/3rd/library/platform/utils/Base/Archive.h b/external/3rd/library/platform/utils/Base/Archive.h index c461f4d7..cb1bc1c3 100755 --- a/external/3rd/library/platform/utils/Base/Archive.h +++ b/external/3rd/library/platform/utils/Base/Archive.h @@ -332,64 +332,13 @@ const unsigned MAX_ARRAY_SIZE = 1024; source.advance(source.getSize()); } - inline void get(ByteStream::ReadIterator & source, double & target) + template + inline void get(ByteStream::ReadIterator & source, T & target) { - source.get(&target, 8); + source.get(&target, sizeof(T)); target = byteSwap(target); } - inline void get(ByteStream::ReadIterator & source, float & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint64 & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int64 & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint32 & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int32 & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint16 & target) - { - source.get(&target, 2); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int16 & target) - { - source.get(&target, 2); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint8 & target) - { - source.get(&target, 1); - } - - inline void get(ByteStream::ReadIterator & source, int8 & target) - { - source.get(&target, 1); - } - inline void get(ByteStream::ReadIterator & source, unsigned char * const target, const unsigned int targetSize) { source.get(target, targetSize); @@ -410,70 +359,13 @@ const unsigned MAX_ARRAY_SIZE = 1024; source.advance(source.getSize()); } - inline void put(ByteStream & target, const double value) + template + inline void put(ByteStream & target, const T value) { - double temp = byteSwap(value); - target.put(&temp, 8); + T temp = byteSwap(value); + target.put(&temp, sizeof(T)); } - inline void put(ByteStream & target, const float value) - { - float temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const uint64 value) - { - uint64 temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const int64 value) - { - int64 temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const uint32 value) - { - uint32 temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const int32 value) - { - int32 temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const uint16 value) - { - uint16 temp = byteSwap(value); - target.put(&temp, 2); - } - - inline void put(ByteStream & target, const int16 value) - { - int16 temp = byteSwap(value); - target.put(&temp, 2); - } - - inline void put(ByteStream & target, const uint8 value) - { - target.put(&value, 1); - } - - inline void put(ByteStream & target, const int8 value) - { - target.put(&value, 1); - } - - inline void put(ByteStream & target, const bool & source) - { - target.put(&source, 1); - } - - inline void put(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) { target.put(source, sourceSize); diff --git a/external/3rd/library/platform/utils/Base/linux/Archive.h b/external/3rd/library/platform/utils/Base/linux/Archive.h index bb623b49..e352c689 100755 --- a/external/3rd/library/platform/utils/Base/linux/Archive.h +++ b/external/3rd/library/platform/utils/Base/linux/Archive.h @@ -12,7 +12,6 @@ namespace Base #ifdef PACK_BIG_ENDIAN - inline double byteSwap(double value) { byteReverse(&value); return value; } inline float byteSwap(float value) { byteReverse(&value); return value; } inline uint64 byteSwap(uint64 value) { byteReverse(&value); return value; } @@ -21,18 +20,9 @@ namespace Base inline int32 byteSwap(int32 value) { byteReverse(&value); return value; } inline uint16 byteSwap(uint16 value) { byteReverse(&value); return value; } inline int16 byteSwap(int16 value) { byteReverse(&value); return value; } - #else - - inline double byteSwap(double value) { return value; } - inline float byteSwap(float value) { return value; } - inline uint64 byteSwap(uint64 value) { return value; } - inline int64 byteSwap(int64 value) { return value; } - inline uint32 byteSwap(uint32 value) { return value; } - inline int32 byteSwap(int32 value) { return value; } - inline uint16 byteSwap(uint16 value) { return value; } - inline int16 byteSwap(int16 value) { return value; } - + template + inline T byteSwap(T value) { return value; } #endif diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/Archive.h b/external/3rd/library/soePlatform/CSAssist/utils/Base/Archive.h index 21287220..ab65a543 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/Archive.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/Archive.h @@ -337,71 +337,19 @@ const unsigned MAX_ARRAY_SIZE = 1024; //////////////////////////////////////////////////////////////////////////////// - inline void get(ByteStream::ReadIterator & source, ByteStream & target) { target.put(source.getBuffer(), source.getSize()); source.advance(source.getSize()); } - inline void get(ByteStream::ReadIterator & source, double & target) + template + inline void get(ByteStream::ReadIterator & source, T & target) { - source.get(&target, 8); + source.get(&target, sizeof(T)); target = byteSwap(target); } - inline void get(ByteStream::ReadIterator & source, float & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint64 & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int64 & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint32 & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int32 & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint16 & target) - { - source.get(&target, 2); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int16 & target) - { - source.get(&target, 2); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint8 & target) - { - source.get(&target, 1); - } - - inline void get(ByteStream::ReadIterator & source, int8 & target) - { - source.get(&target, 1); - } - inline void get(ByteStream::ReadIterator & source, unsigned char * const target, const unsigned int targetSize) { source.get(target, targetSize); @@ -422,70 +370,13 @@ const unsigned MAX_ARRAY_SIZE = 1024; source.advance(source.getSize()); } - inline void put(ByteStream & target, const double value) + template + inline void put(ByteStream & target, const T value) { - double temp = byteSwap(value); - target.put(&temp, 8); + T temp = byteSwap(value); + target.put(&temp, sizeof(T)); } - inline void put(ByteStream & target, const float value) - { - float temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const uint64 value) - { - uint64 temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const int64 value) - { - int64 temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const uint32 value) - { - uint32 temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const int32 value) - { - int32 temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const uint16 value) - { - uint16 temp = byteSwap(value); - target.put(&temp, 2); - } - - inline void put(ByteStream & target, const int16 value) - { - int16 temp = byteSwap(value); - target.put(&temp, 2); - } - - inline void put(ByteStream & target, const uint8 value) - { - target.put(&value, 1); - } - - inline void put(ByteStream & target, const int8 value) - { - target.put(&value, 1); - } - - inline void put(ByteStream & target, const bool & source) - { - target.put(&source, 1); - } - - inline void put(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) { target.put(source, sourceSize); @@ -677,67 +568,12 @@ const unsigned MAX_ARRAY_SIZE = 1024; } } - inline bool overwriteEnd(ByteStream & target, const double value) - { - double temp = byteSwap(value); - return target.overwriteEnd(&temp, 8); - } - inline bool overwriteEnd(ByteStream & target, const float value) + template + inline bool overwriteEnd(ByteStream & target, const T value) { - float temp = byteSwap(value); - return target.overwriteEnd(&temp, 4); - } - - inline bool overwriteEnd(ByteStream & target, const uint64 value) - { - uint64 temp = byteSwap(value); - return target.overwriteEnd(&temp, 8); - } - - inline bool overwriteEnd(ByteStream & target, const int64 value) - { - int64 temp = byteSwap(value); - return target.overwriteEnd(&temp, 8); - } - - inline bool overwriteEnd(ByteStream & target, const uint32 value) - { - uint32 temp = byteSwap(value); - return target.overwriteEnd(&temp, 4); - } - - inline bool overwriteEnd(ByteStream & target, const int32 value) - { - int32 temp = byteSwap(value); - return target.overwriteEnd(&temp, 4); - } - - inline bool overwriteEnd(ByteStream & target, const uint16 value) - { - uint16 temp = byteSwap(value); - return target.overwriteEnd(&temp, 2); - } - - inline bool overwriteEnd(ByteStream & target, const int16 value) - { - int16 temp = byteSwap(value); - return target.overwriteEnd(&temp, 2); - } - - inline bool overwriteEnd(ByteStream & target, const uint8 value) - { - return target.overwriteEnd(&value, 1); - } - - inline bool overwriteEnd(ByteStream & target, const int8 value) - { - return target.overwriteEnd(&value, 1); - } - - inline bool overwriteEnd(ByteStream & target, const bool & source) - { - return target.overwriteEnd(&source, 1); + T temp = byteSwap(value); + return target.overwriteEnd(&temp, sizeof(T)); } inline bool overwriteEnd(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Archive.h b/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Archive.h index bb623b49..762aabe6 100755 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Archive.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/linux/Archive.h @@ -23,15 +23,8 @@ namespace Base inline int16 byteSwap(int16 value) { byteReverse(&value); return value; } #else - - inline double byteSwap(double value) { return value; } - inline float byteSwap(float value) { return value; } - inline uint64 byteSwap(uint64 value) { return value; } - inline int64 byteSwap(int64 value) { return value; } - inline uint32 byteSwap(uint32 value) { return value; } - inline int32 byteSwap(int32 value) { return value; } - inline uint16 byteSwap(uint16 value) { return value; } - inline int16 byteSwap(int16 value) { return value; } + template + inline T byteSwap(T value) { return value; } #endif diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/Base/Archive.h b/external/3rd/library/soePlatform/CTServiceGameAPI/Base/Archive.h index 856dcd95..f12194c7 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/Base/Archive.h +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/Base/Archive.h @@ -330,64 +330,13 @@ const unsigned MAX_ARRAY_SIZE = 1024; source.advance(source.getSize()); } - inline void get(ByteStream::ReadIterator & source, double & target) + template + inline void get(ByteStream::ReadIterator & source, T & target) { - source.get(&target, 8); + source.get(&target, sizeof(T)); target = byteSwap(target); } - inline void get(ByteStream::ReadIterator & source, float & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint64 & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int64 & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint32 & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int32 & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint16 & target) - { - source.get(&target, 2); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int16 & target) - { - source.get(&target, 2); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint8 & target) - { - source.get(&target, 1); - } - - inline void get(ByteStream::ReadIterator & source, int8 & target) - { - source.get(&target, 1); - } - inline void get(ByteStream::ReadIterator & source, unsigned char * const target, const unsigned int targetSize) { source.get(target, targetSize); @@ -408,70 +357,13 @@ const unsigned MAX_ARRAY_SIZE = 1024; source.advance(source.getSize()); } - inline void put(ByteStream & target, const double value) + template + inline void put(ByteStream & target, const T value) { - double temp = byteSwap(value); - target.put(&temp, 8); + T temp = byteSwap(value); + target.put(&temp, sizeof(T)); } - inline void put(ByteStream & target, const float value) - { - float temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const uint64 value) - { - uint64 temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const int64 value) - { - int64 temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const uint32 value) - { - uint32 temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const int32 value) - { - int32 temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const uint16 value) - { - uint16 temp = byteSwap(value); - target.put(&temp, 2); - } - - inline void put(ByteStream & target, const int16 value) - { - int16 temp = byteSwap(value); - target.put(&temp, 2); - } - - inline void put(ByteStream & target, const uint8 value) - { - target.put(&value, 1); - } - - inline void put(ByteStream & target, const int8 value) - { - target.put(&value, 1); - } - - inline void put(ByteStream & target, const bool & source) - { - target.put(&source, 1); - } - - inline void put(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) { target.put(source, sourceSize); @@ -667,67 +559,11 @@ const unsigned MAX_ARRAY_SIZE = 1024; //////////////////////////////////////////////////////////////////////////////// - inline bool overwriteEnd(ByteStream & target, const double value) + template + inline bool overwriteEnd(ByteStream & target, const T value) { - double temp = byteSwap(value); - return target.overwriteEnd(&temp, 8); - } - - inline bool overwriteEnd(ByteStream & target, const float value) - { - float temp = byteSwap(value); - return target.overwriteEnd(&temp, 4); - } - - inline bool overwriteEnd(ByteStream & target, const uint64 value) - { - uint64 temp = byteSwap(value); - return target.overwriteEnd(&temp, 8); - } - - inline bool overwriteEnd(ByteStream & target, const int64 value) - { - int64 temp = byteSwap(value); - return target.overwriteEnd(&temp, 8); - } - - inline bool overwriteEnd(ByteStream & target, const uint32 value) - { - uint32 temp = byteSwap(value); - return target.overwriteEnd(&temp, 4); - } - - inline bool overwriteEnd(ByteStream & target, const int32 value) - { - int32 temp = byteSwap(value); - return target.overwriteEnd(&temp, 4); - } - - inline bool overwriteEnd(ByteStream & target, const uint16 value) - { - uint16 temp = byteSwap(value); - return target.overwriteEnd(&temp, 2); - } - - inline bool overwriteEnd(ByteStream & target, const int16 value) - { - int16 temp = byteSwap(value); - return target.overwriteEnd(&temp, 2); - } - - inline bool overwriteEnd(ByteStream & target, const uint8 value) - { - return target.overwriteEnd(&value, 1); - } - - inline bool overwriteEnd(ByteStream & target, const int8 value) - { - return target.overwriteEnd(&value, 1); - } - - inline bool overwriteEnd(ByteStream & target, const bool & source) - { - return target.overwriteEnd(&source, 1); + T temp = byteSwap(value); + return target.overwriteEnd(&temp, sizeof(T)); } inline bool overwriteEnd(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/Base/linux/Archive.h b/external/3rd/library/soePlatform/CTServiceGameAPI/Base/linux/Archive.h index bb623b49..68bb3f9d 100755 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/Base/linux/Archive.h +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/Base/linux/Archive.h @@ -23,16 +23,8 @@ namespace Base inline int16 byteSwap(int16 value) { byteReverse(&value); return value; } #else - - inline double byteSwap(double value) { return value; } - inline float byteSwap(float value) { return value; } - inline uint64 byteSwap(uint64 value) { return value; } - inline int64 byteSwap(int64 value) { return value; } - inline uint32 byteSwap(uint32 value) { return value; } - inline int32 byteSwap(int32 value) { return value; } - inline uint16 byteSwap(uint16 value) { return value; } - inline int16 byteSwap(int16 value) { return value; } - + template + inline T byteSwap(T value) { return value; } #endif diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/Archive.h b/external/3rd/library/soePlatform/ChatAPI/utils/Base/Archive.h index 8e13f2c0..1bf3be66 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/Archive.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/Archive.h @@ -340,64 +340,13 @@ const unsigned MAX_ARRAY_SIZE = 1024; source.advance(source.getSize()); } - inline void get(ByteStream::ReadIterator & source, double & target) + template + inline void get(ByteStream::ReadIterator & source, T & target) { - source.get(&target, 8); + source.get(&target, sizeof(T)); target = byteSwap(target); } - inline void get(ByteStream::ReadIterator & source, float & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint64 & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int64 & target) - { - source.get(&target, 8); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint32 & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int32 & target) - { - source.get(&target, 4); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint16 & target) - { - source.get(&target, 2); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, int16 & target) - { - source.get(&target, 2); - target = byteSwap(target); - } - - inline void get(ByteStream::ReadIterator & source, uint8 & target) - { - source.get(&target, 1); - } - - inline void get(ByteStream::ReadIterator & source, int8 & target) - { - source.get(&target, 1); - } - inline unsigned get(ByteStream::ReadIterator & source, unsigned char * const target, const unsigned int targetSize) { return source.get(target, targetSize); @@ -418,70 +367,13 @@ const unsigned MAX_ARRAY_SIZE = 1024; source.advance(source.getSize()); } - inline void put(ByteStream & target, const double value) + template + inline void put(ByteStream & target, const T value) { - double temp = byteSwap(value); - target.put(&temp, 8); + T temp = byteSwap(value); + target.put(&temp, sizeof(T)); } - inline void put(ByteStream & target, const float value) - { - float temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const uint64 value) - { - uint64 temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const int64 value) - { - int64 temp = byteSwap(value); - target.put(&temp, 8); - } - - inline void put(ByteStream & target, const uint32 value) - { - uint32 temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const int32 value) - { - int32 temp = byteSwap(value); - target.put(&temp, 4); - } - - inline void put(ByteStream & target, const uint16 value) - { - uint16 temp = byteSwap(value); - target.put(&temp, 2); - } - - inline void put(ByteStream & target, const int16 value) - { - int16 temp = byteSwap(value); - target.put(&temp, 2); - } - - inline void put(ByteStream & target, const uint8 value) - { - target.put(&value, 1); - } - - inline void put(ByteStream & target, const int8 value) - { - target.put(&value, 1); - } - - inline void put(ByteStream & target, const bool & source) - { - target.put(&source, 1); - } - - inline void put(ByteStream & target, const unsigned char * const source, const unsigned int sourceSize) { target.put(source, sourceSize); @@ -678,62 +570,11 @@ const unsigned MAX_ARRAY_SIZE = 1024; //////////////////////////////////////////////////////////////////////////////// - inline bool overwriteEnd(ByteStream & target, const double value) + template + inline bool overwriteEnd(ByteStream & target, const T value) { - double temp = byteSwap(value); - return target.overwriteEnd(&temp, 8); - } - - inline bool overwriteEnd(ByteStream & target, const float value) - { - float temp = byteSwap(value); - return target.overwriteEnd(&temp, 4); - } - - inline bool overwriteEnd(ByteStream & target, const uint64 value) - { - uint64 temp = byteSwap(value); - return target.overwriteEnd(&temp, 8); - } - - inline bool overwriteEnd(ByteStream & target, const int64 value) - { - int64 temp = byteSwap(value); - return target.overwriteEnd(&temp, 8); - } - - inline bool overwriteEnd(ByteStream & target, const uint32 value) - { - uint32 temp = byteSwap(value); - return target.overwriteEnd(&temp, 4); - } - - inline bool overwriteEnd(ByteStream & target, const int32 value) - { - int32 temp = byteSwap(value); - return target.overwriteEnd(&temp, 4); - } - - inline bool overwriteEnd(ByteStream & target, const uint16 value) - { - uint16 temp = byteSwap(value); - return target.overwriteEnd(&temp, 2); - } - - inline bool overwriteEnd(ByteStream & target, const int16 value) - { - int16 temp = byteSwap(value); - return target.overwriteEnd(&temp, 2); - } - - inline bool overwriteEnd(ByteStream & target, const uint8 value) - { - return target.overwriteEnd(&value, 1); - } - - inline bool overwriteEnd(ByteStream & target, const int8 value) - { - return target.overwriteEnd(&value, 1); + T temp = byteSwap(value); + return target.overwriteEnd(&temp, sizeof(T)); } inline bool overwriteEnd(ByteStream & target, const bool & source) diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Archive.h b/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Archive.h index bb623b49..f71faf14 100755 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Archive.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Archive.h @@ -24,14 +24,8 @@ namespace Base #else - inline double byteSwap(double value) { return value; } - inline float byteSwap(float value) { return value; } - inline uint64 byteSwap(uint64 value) { return value; } - inline int64 byteSwap(int64 value) { return value; } - inline uint32 byteSwap(uint32 value) { return value; } - inline int32 byteSwap(int32 value) { return value; } - inline uint16 byteSwap(uint16 value) { return value; } - inline int16 byteSwap(int16 value) { return value; } + template + inline T byteSwap(T value) { return value; } #endif diff --git a/external/ours/library/archive/src/shared/Archive.h b/external/ours/library/archive/src/shared/Archive.h index 2921d66f..39771523 100755 --- a/external/ours/library/archive/src/shared/Archive.h +++ b/external/ours/library/archive/src/shared/Archive.h @@ -15,73 +15,10 @@ namespace Archive { //--------------------------------------------------------------------- - -inline void get(ReadIterator & source, double & target) +template +inline void get(ReadIterator & source, T & target) { - source.get(&target, 8); -} - -//--------------------------------------------------------------------- - -inline void get(ReadIterator & source, float & target) -{ - source.get(&target, 4); -} - -//--------------------------------------------------------------------- - -inline void get(ReadIterator & source, unsigned long int & target) -{ - source.get(&target, 4); -} - -//--------------------------------------------------------------------- - -inline void get(ReadIterator & source, signed long int & target) -{ - source.get(&target, 4); -} - -//--------------------------------------------------------------------- - -inline void get(ReadIterator & source, unsigned int & target) -{ - source.get(&target, 4); -} - -//--------------------------------------------------------------------- - -inline void get(ReadIterator & source, signed int & target) -{ - source.get(&target, 4); -} - -//--------------------------------------------------------------------- - -inline void get(ReadIterator & source, unsigned short int & target) -{ - source.get(&target, 2); -} - -//--------------------------------------------------------------------- - -inline void get(ReadIterator & source, signed short int & target) -{ - source.get(&target, 2); -} - -//--------------------------------------------------------------------- - -inline void get(ReadIterator & source, unsigned char & target) -{ - source.get(&target, 1); -} - -//--------------------------------------------------------------------- - -inline void get(ReadIterator & source, signed char & target) -{ - source.get(&target, 1); + source.get(&target, sizeof(T)); } //--------------------------------------------------------------------- @@ -215,79 +152,10 @@ template inline void get(ReadIterator & source, A * target, int leng //--------------------------------------------------------------------- -inline void put(ByteStream & target, const double & source) +template +inline void put(ByteStream & target, const T & source) { - target.put(&source, 8); -} - -//--------------------------------------------------------------------- - -inline void put(ByteStream & target, const float & source) -{ - target.put(&source, 4); -} - -//--------------------------------------------------------------------- - -inline void put(ByteStream & target, const unsigned long int & source) -{ - target.put(&source, 4); -} - -//--------------------------------------------------------------------- - -inline void put(ByteStream & target, const signed long int & source) -{ - target.put(&source, 4); -} - -//--------------------------------------------------------------------- - -inline void put(ByteStream & target, const unsigned int & source) -{ - target.put(&source, 4); -} - -//--------------------------------------------------------------------- - -inline void put(ByteStream & target, const signed int & source) -{ - target.put(&source, 4); -} - -//--------------------------------------------------------------------- - -inline void put(ByteStream & target, const unsigned short int & source) -{ - target.put(&source, 2); -} - -//--------------------------------------------------------------------- - -inline void put(ByteStream & target, const signed short int & source) -{ - target.put(&source, 2); -} - -//--------------------------------------------------------------------- - -inline void put(ByteStream & target, const unsigned char & source) -{ - target.put(&source, 1); -} - -//--------------------------------------------------------------------- - -inline void put(ByteStream & target, const signed char & source) -{ - target.put(&source, 1); -} - -//--------------------------------------------------------------------- - -inline void put(ByteStream & target, const char & source) -{ - target.put(&source, 1); + target.put(&source, sizeof(T)); } //---------------------------------------------------------------------