From b6448e08332635dac1f34f32799f51450cedf318 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Sun, 19 Jan 2014 02:56:18 -0700 Subject: [PATCH] Added missing template<> --- .../src/shared/NetworkIdAutoDeltaPackedMap.cpp | 3 ++- .../library/archive/src/shared/AutoDeltaPackedMap.h | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp b/engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp index 88eafbdf..d1ba7a66 100644 --- a/engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp +++ b/engine/shared/library/sharedUtility/src/shared/NetworkIdAutoDeltaPackedMap.cpp @@ -14,7 +14,7 @@ namespace Archive { - + template<> void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { char temp[200]; @@ -46,6 +46,7 @@ namespace Archive // ====================================================================== + template<> void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { char temp[200]; diff --git a/external/ours/library/archive/src/shared/AutoDeltaPackedMap.h b/external/ours/library/archive/src/shared/AutoDeltaPackedMap.h index 97ccc1cf..e73b56b3 100644 --- a/external/ours/library/archive/src/shared/AutoDeltaPackedMap.h +++ b/external/ours/library/archive/src/shared/AutoDeltaPackedMap.h @@ -180,53 +180,63 @@ namespace Archive // ====================================================================== // pack-to-string functions for specific types + template<> inline void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { internal_pack(target, buffer, "%i %f"); } + template<> inline void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { internal_unpack(source, buffer, "%i %.2f:"); } + template<> inline void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { internal_pack(target, buffer, "%i %i"); } + template<> inline void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { internal_unpack(source, buffer, "%i %i:"); } + template<> inline void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { internal_pack(target, buffer, "%i %u"); } + template<> inline void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { internal_unpack(source, buffer, "%i %u:"); } #ifdef WIN32 + template<> inline void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { internal_pack(target, buffer, "%lu %I64u"); } + template<> inline void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { internal_unpack(source, buffer, "%lu %I64u:"); } #else + template<> inline void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { internal_pack(target, buffer, "%lu %llu"); } + template<> inline void AutoDeltaPackedMap::unpack(ReadIterator & source, std::string & buffer) { internal_unpack(source, buffer, "%lu %llu:");