Skip to content

Commit 42e1adc

Browse files
committed
c++11 - use std::bind
1 parent fa35e1c commit 42e1adc

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

plugins/input/pgraster/pgraster_wkb_reader.cpp

+9-11
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@
3636
#include <mapnik/util/conversions.hpp>
3737
#include <mapnik/util/trim.hpp>
3838
#include <mapnik/box2d.hpp> // for box2d
39-
40-
// boost
41-
#include <boost/bind.hpp>
39+
#include <functional>
4240

4341
#include <cstdint>
4442

@@ -229,27 +227,27 @@ mapnik::raster_ptr pgraster_wkb_reader::read_indexed(mapnik::box2d<double> const
229227
// mapnik does not support signed anyway
230228
case PT_8BUI:
231229
return read_data_band(bbox, width_, height_, hasnodata,
232-
boost::bind(read_uint8, &ptr_));
230+
std::bind(read_uint8, &ptr_));
233231
break;
234232
case PT_16BSI:
235233
// mapnik does not support signed anyway
236234
case PT_16BUI:
237235
return read_data_band(bbox, width_, height_, hasnodata,
238-
boost::bind(read_uint16, &ptr_, endian_));
236+
std::bind(read_uint16, &ptr_, endian_));
239237
break;
240238
case PT_32BSI:
241239
// mapnik does not support signed anyway
242240
case PT_32BUI:
243241
return read_data_band(bbox, width_, height_, hasnodata,
244-
boost::bind(read_uint32, &ptr_, endian_));
242+
std::bind(read_uint32, &ptr_, endian_));
245243
break;
246244
case PT_32BF:
247245
return read_data_band(bbox, width_, height_, hasnodata,
248-
boost::bind(read_float32, &ptr_, endian_));
246+
std::bind(read_float32, &ptr_, endian_));
249247
break;
250248
case PT_64BF:
251249
return read_data_band(bbox, width_, height_, hasnodata,
252-
boost::bind(read_float64, &ptr_, endian_));
250+
std::bind(read_float64, &ptr_, endian_));
253251
break;
254252
default:
255253
std::ostringstream err;
@@ -320,19 +318,19 @@ mapnik::raster_ptr pgraster_wkb_reader::read_grayscale(mapnik::box2d<double> con
320318
// mapnik does not support signed anyway
321319
case PT_8BUI:
322320
return read_grayscale_band(bbox, width_, height_, hasnodata,
323-
boost::bind(read_uint8, &ptr_));
321+
std::bind(read_uint8, &ptr_));
324322
break;
325323
case PT_16BSI:
326324
// mapnik does not support signed anyway
327325
case PT_16BUI:
328326
return read_grayscale_band(bbox, width_, height_, hasnodata,
329-
boost::bind(read_uint16, &ptr_, endian_));
327+
std::bind(read_uint16, &ptr_, endian_));
330328
break;
331329
case PT_32BSI:
332330
// mapnik does not support signed anyway
333331
case PT_32BUI:
334332
return read_grayscale_band(bbox, width_, height_, hasnodata,
335-
boost::bind(read_uint32, &ptr_, endian_));
333+
std::bind(read_uint32, &ptr_, endian_));
336334
break;
337335
default:
338336
std::ostringstream err;

0 commit comments

Comments
 (0)