62b20769ee
Apply `clang-modernize` (based on Clang 3.6) transformations to the
codebase while making sure to support Clang>=3.4 and GCC>=4.8.
We apply the transformations in parallel to speed up the quite
time consuming process, and use our `clang-format` style file
to automatically format the code respecting our coding conventions.
We use the following self-explanatory transformations:
* AddOverride
* LoopConvert
* PassByValue
* ReplaceAutoPtr
* UseAuto
* UseNullptr
This required a `compile_commands.json` compilation database, e.g.
ccmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=1
for CMake or check Bear for a Makefile based solution (or even Ninja).
git ls-files -x '*.cpp|*.h' | \
xargs -I{} -P $(nproc) clang-modernize -p build -final-syntax-check -format -style=file -summary -for-compilers=clang-3.4,gcc-4.8 -include . -exclude third_party {}
Boom!
References:
* http://clang.llvm.org/extra/clang-modernize.html
* http://clang.llvm.org/extra/ModernizerUsage.html
97 lines
2.5 KiB
C++
97 lines
2.5 KiB
C++
/*
|
|
|
|
Copyright (c) 2013, Project OSRM contributors
|
|
All rights reserved.
|
|
|
|
Redistribution and use in source and binary forms, with or without modification,
|
|
are permitted provided that the following conditions are met:
|
|
|
|
Redistributions of source code must retain the above copyright notice, this list
|
|
of conditions and the following disclaimer.
|
|
Redistributions in binary form must reproduce the above copyright notice, this
|
|
list of conditions and the following disclaimer in the documentation and/or
|
|
other materials provided with the distribution.
|
|
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
|
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
// based on
|
|
// https://svn.apache.org/repos/asf/mesos/tags/release-0.9.0-incubating-RC0/src/common/json.hpp
|
|
|
|
#ifndef JSON_CONTAINER_HPP
|
|
#define JSON_CONTAINER_HPP
|
|
|
|
#include <variant/variant.hpp>
|
|
|
|
#include <iostream>
|
|
#include <vector>
|
|
#include <string>
|
|
#include <unordered_map>
|
|
|
|
namespace osrm
|
|
{
|
|
namespace json
|
|
{
|
|
|
|
struct Object;
|
|
struct Array;
|
|
|
|
struct String
|
|
{
|
|
String() {}
|
|
String(const char *value) : value(value) {}
|
|
String(std::string value) : value(std::move(value)) {}
|
|
std::string value;
|
|
};
|
|
|
|
struct Number
|
|
{
|
|
Number() {}
|
|
Number(double value) : value(static_cast<double>(value)) {}
|
|
double value;
|
|
};
|
|
|
|
struct True
|
|
{
|
|
};
|
|
|
|
struct False
|
|
{
|
|
};
|
|
|
|
struct Null
|
|
{
|
|
};
|
|
|
|
using Value = mapbox::util::variant<String,
|
|
Number,
|
|
mapbox::util::recursive_wrapper<Object>,
|
|
mapbox::util::recursive_wrapper<Array>,
|
|
True,
|
|
False,
|
|
Null>;
|
|
|
|
struct Object
|
|
{
|
|
std::unordered_map<std::string, Value> values;
|
|
};
|
|
|
|
struct Array
|
|
{
|
|
std::vector<Value> values;
|
|
};
|
|
|
|
} // namespace JSON
|
|
} // namespace osrm
|
|
#endif // JSON_CONTAINER_HPP
|