diff options
author | megamage <none@none> | 2009-06-27 17:54:03 -0500 |
---|---|---|
committer | megamage <none@none> | 2009-06-27 17:54:03 -0500 |
commit | 7d24efd16dac4899de7a51268cde255aed1d3d77 (patch) | |
tree | 27da8deaadd50a818884cf7f221fbc9a1046a847 /src/shared/vmap | |
parent | b9029be234312b1a4ae1c4b7d89641d49eff91aa (diff) |
[8080] Portability fixes for some Unix platforms. Author: VladimirMangos
* Add #include <stdio.h> to some fiels where related functions call.
* Avoid template dependent lookup for fields in class LockedQueue.
--HG--
branch : trunk
Diffstat (limited to 'src/shared/vmap')
-rw-r--r-- | src/shared/vmap/CoordModelMapping.cpp | 9 | ||||
-rw-r--r-- | src/shared/vmap/CoordModelMapping.h | 7 | ||||
-rw-r--r-- | src/shared/vmap/DebugCmdLogger.cpp | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/shared/vmap/CoordModelMapping.cpp b/src/shared/vmap/CoordModelMapping.cpp index 86e3347a614..39d1165f115 100644 --- a/src/shared/vmap/CoordModelMapping.cpp +++ b/src/shared/vmap/CoordModelMapping.cpp @@ -21,7 +21,7 @@ #include "CoordModelMapping.h" #include <string.h> -#include <cstdio> +#include <stdio.h> using namespace G3D; @@ -45,6 +45,13 @@ namespace VMAP return(CMappingEntry::getKeyString(iMapId,xPos, yPos)); } + const std::string CMappingEntry::getKeyString( unsigned int pMapId, int pXPos, int pYPos ) + { + char b[100]; + sprintf(b,"%03u_%d_%d", pMapId, pXPos, pYPos); + return(std::string(b)); + } + //============================================================ //============================================================ //============================================================ diff --git a/src/shared/vmap/CoordModelMapping.h b/src/shared/vmap/CoordModelMapping.h index c1f49462962..7684bf1b373 100644 --- a/src/shared/vmap/CoordModelMapping.h +++ b/src/shared/vmap/CoordModelMapping.h @@ -75,12 +75,7 @@ namespace VMAP const std::string getKeyString() const; inline const G3D::Array<std::string>& getFilenames() const { return(iFilenames); } - static const std::string getKeyString(unsigned int pMapId, int pXPos, int pYPos) - { - char b[100]; - sprintf(b,"%03u_%d_%d", pMapId, pXPos, pYPos); - return(std::string(b)); - } + static const std::string getKeyString(unsigned int pMapId, int pXPos, int pYPos); }; diff --git a/src/shared/vmap/DebugCmdLogger.cpp b/src/shared/vmap/DebugCmdLogger.cpp index e6b36572c45..c899606045b 100644 --- a/src/shared/vmap/DebugCmdLogger.cpp +++ b/src/shared/vmap/DebugCmdLogger.cpp @@ -21,6 +21,7 @@ #include <cstdio> #include "DebugCmdLogger.h" +#include <stdio.h> using namespace G3D; |