update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / libs / gil / test / extension / io / paths.hpp

diff --git a/ceph/src/boost/libs/gil/test/extension/io/paths.hpp b/ceph/src/boost/libs/gil/test/extension/io/paths.hpp
index 9dd336de21685075e7d4eae2352aa0f042fac6cf..9726afcccf6d8fc3046f3bd8071f383938f77691 100644 (file)
--- a/ceph/src/boost/libs/gil/test/extension/io/paths.hpp
+++ b/ceph/src/boost/libs/gil/test/extension/io/paths.hpp
@@ -5,8 +5,8 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#ifndef BOOST_GIL_IO_TEST_PATHS_HPP
-#define BOOST_GIL_IO_TEST_PATHS_HPP
+#ifndef BOOST_GIL_TEST_EXTENSION_IO_PATHS_HPP
+#define BOOST_GIL_TEST_EXTENSION_IO_PATHS_HPP
 
 // Disable warning: conversion to 'std::atomic<int>::__integral_type {aka int}' from 'long int' may alter its value
 #if defined(BOOST_CLANG)
@@ -30,8 +30,11 @@
 #pragma GCC diagnostic pop
 #endif
 
+#include <string>
+
 // `base` holds the path to ../.., i.e. the directory containing `images`
-static const std::string base = (boost::filesystem::absolute(boost::filesystem::path(__FILE__)).parent_path().string()) + "/";
+static const std::string base =
+    (boost::filesystem::absolute(boost::filesystem::path(__FILE__)).parent_path().string()) + "/";
 
 static const std::string bmp_in  = base + "images/bmp/";
 static const std::string bmp_out = base + "output/";
@@ -46,7 +49,7 @@ static const std::string png_out     = base + "output/";
 static const std::string pnm_in  = base + "images/pnm/";
 static const std::string pnm_out = base + "output/";
 
-static const std::string raw_in  = base + "images/raw/";
+static const std::string raw_in = base + "images/raw/";
 
 static const std::string targa_in  = base + "images/targa/";
 static const std::string targa_out = base + "output/";
@@ -55,12 +58,12 @@ static const std::string tiff_in    = base + "images/tiff/";
 static const std::string tiff_out   = base + "output/";
 static const std::string tiff_in_GM = tiff_in + "graphicmagick/";
 
-static const std::string bmp_filename  ( bmp_in      + "test.bmp"               );
-static const std::string jpeg_filename ( jpeg_in     + "test.jpg"               );
-static const std::string png_filename  ( png_base_in + "test.png"               );
-static const std::string pnm_filename  ( pnm_in      + "rgb.pnm"                );
-static const std::string raw_filename  ( raw_in      + "RAW_CANON_D30_SRGB.CRW" );
-static const std::string targa_filename( targa_in    + "24BPP_compressed.tga"   );
-static const std::string tiff_filename ( tiff_in     + "test.tif"               );
+static const std::string bmp_filename(bmp_in + "test.bmp");
+static const std::string jpeg_filename(jpeg_in + "test.jpg");
+static const std::string png_filename(png_base_in + "test.png");
+static const std::string pnm_filename(pnm_in + "rgb.pnm");
+static const std::string raw_filename(raw_in + "RAW_CANON_D30_SRGB.CRW");
+static const std::string targa_filename(targa_in + "24BPP_compressed.tga");
+static const std::string tiff_filename(tiff_in + "test.tif");
 
-#endif // BOOST_GIL_IO_TEST_PATHS_HPP
+#endif // BOOST_GIL_TEST_EXTENSION_IO_PATHS_HPP