From 1582f681aea0ef3e42e876079631b0e72027bf81 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 10 Mar 2016 13:40:48 -0800 Subject: [PATCH] fix -Wheader-hygiene warnings --- benchmark/compare_images.hpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/benchmark/compare_images.hpp b/benchmark/compare_images.hpp index fb0e4ac95..ff90e01a0 100644 --- a/benchmark/compare_images.hpp +++ b/benchmark/compare_images.hpp @@ -1,11 +1,10 @@ -#ifndef __MAPNIK_COMPARE_IMAGES_HPP__ -#define __MAPNIK_COMPARE_IMAGES_HPP__ +#ifndef MAPNIK_COMPARE_IMAGES_HPP +#define MAPNIK_COMPARE_IMAGES_HPP #include #include #include -using namespace mapnik; namespace benchmark { @@ -23,15 +22,15 @@ namespace benchmark { throw mapnik::image_reader_exception("Failed to load: " + src_fn); } - const image_any desc_any = reader1->read(0,0,reader1->width(), reader1->height()); - const image_any src_any = reader2->read(0,0,reader2->width(), reader2->height()); + const mapnik::image_any desc_any = reader1->read(0,0,reader1->width(), reader1->height()); + const mapnik::image_any src_any = reader2->read(0,0,reader2->width(), reader2->height()); - image_rgba8 const& dest = util::get(desc_any); - image_rgba8 const& src = util::get(src_any); + mapnik::image_rgba8 const& dest = mapnik::util::get(desc_any); + mapnik::image_rgba8 const& src = mapnik::util::get(src_any); return compare(dest, src, 0, true) == 0; } } -#endif // __MAPNIK_COMPARE_IMAGES_HPP__ +#endif // MAPNIK_COMPARE_IMAGES_HPP