sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2463 from joto/patch-2

Browse source 
Use std uint8_t instead of boost::uint8_t
This commit is contained in:
Artem Pavlenko 2014-09-30 15:01:35 +01:00
commit 7238a5a7e5
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/input/pgraster/pgraster_wkb_reader.cpp
View file

@ -40,6 +40,8 @@
// boost // boost
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <cstdint>
namespace { namespace {
uint8_t uint8_t
@ -48,7 +50,7 @@ read_uint8(const uint8_t** from) {
} }
uint16_t uint16_t
read_uint16(const boost::uint8_t** from, boost::uint8_t littleEndian) { read_uint16(const uint8_t** from, uint8_t littleEndian) {
uint16_t ret = 0; uint16_t ret = 0;
if (littleEndian) { if (littleEndian) {
@ -71,7 +73,7 @@ read_int16(const uint8_t** from, uint8_t littleEndian) {
} }
double double
read_float64(const boost::uint8_t** from, boost::uint8_t littleEndian) { read_float64(const uint8_t** from, uint8_t littleEndian) {
union { union {
double d; double d;
@ -104,7 +106,7 @@ read_float64(const boost::uint8_t** from, boost::uint8_t littleEndian) {
} }
uint32_t uint32_t
read_uint32(const boost::uint8_t** from, boost::uint8_t littleEndian) { read_uint32(const uint8_t** from, uint8_t littleEndian) {
uint32_t ret = 0; uint32_t ret = 0;
if (littleEndian) { if (littleEndian) {
@ -125,7 +127,7 @@ read_uint32(const boost::uint8_t** from, boost::uint8_t littleEndian) {
} }
int32_t int32_t
read_int32(const boost::uint8_t** from, boost::uint8_t littleEndian) { read_int32(const uint8_t** from, uint8_t littleEndian) {
return read_uint32(from, littleEndian); return read_uint32(from, littleEndian);
} }