Merge commit '879f7eb04200d7d2c28af565229bf6e3d54274fd' into retry/libosmium

2016-10-03 13:08:59 -04:00
parent 050585bbd9 879f7eb042
commit 5b4e2950d9
208 changed files with 11590 additions and 4051 deletions
@@ -3,11 +3,3 @@ Osmium uses Catch (https://github.com/philsquared/Catch/) for its unit tests.
 Only one header file is needed (catch.hpp) which can be downloaded from
 http://builds.catch-lib.net/ and put into the include directory.

-Osmium needs a few changes to catch.hpp, they were patched in. To be able to
-compare with the original version, it is stored in include/catch_orig.hpp.
-
-Changes are:
-* Disable more warnings in GCC
-* CATCH_CONFIG_CPP11_NULLPTR must be set for MSVC
-* Problem with test running in loop: https://github.com/philsquared/Catch/issues/271
-