From c22295c7667f710c881b2c497550dcf4903c4787 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Thu, 15 Jan 2009 23:16:15 +0000 Subject: [PATCH] + use fully qualified name in global.hpp --- include/mapnik/global.hpp | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/include/mapnik/global.hpp b/include/mapnik/global.hpp index d27be2747..a85cefa77 100644 --- a/include/mapnik/global.hpp +++ b/include/mapnik/global.hpp @@ -27,29 +27,20 @@ #include -#ifdef __SUNPRO_CC -// Foo -#else -using boost::int32_t; -using boost::uint32_t; -using boost::int16_t; -using boost::uint16_t; -using boost::uint8_t; -#endif namespace mapnik { -#define int2net(A) (int16_t) (((uint16_t) ((uint8_t) (A)[1])) | \ - (((uint16_t) ((uint8_t) (A)[0])) << 8)) +#define int2net(A) (int16_t) (((boost::uint16_t) ((boost::uint8_t) (A)[1])) | \ + (((boost::uint16_t) ((boost::uint8_t) (A)[0])) << 8)) -#define int4net(A) (int32_t) (((uint32_t) ((uint8_t) (A)[3])) | \ - (((uint32_t) ((uint8_t) (A)[2])) << 8) | \ - (((uint32_t) ((uint8_t) (A)[1])) << 16) | \ - (((uint32_t) ((uint8_t) (A)[0])) << 24)) +#define int4net(A) (int32_t) (((boost::uint32_t) ((boost::uint8_t) (A)[3])) | \ + (((boost::uint32_t) ((boost::uint8_t) (A)[2])) << 8) | \ + (((boost::uint32_t) ((boost::uint8_t) (A)[1])) << 16) | \ + (((boost::uint32_t) ((boost::uint8_t) (A)[0])) << 24)) - typedef uint8_t byte; + typedef boost::uint8_t byte; #define float8net(V,M) do { double def_temp; \ ((byte*) &def_temp)[0]=(M)[7]; \ ((byte*) &def_temp)[1]=(M)[6]; \