From 841e3432f66863f4623e00433dcf9f5edecbefd6 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Tue, 14 May 2019 12:50:08 +0700 Subject: [PATCH] flat_hpp to flat.hpp for include path --- .travis.yml | 15 --------------- README.md | 2 +- headers/{flat_hpp => flat.hpp}/flat_map.hpp | 0 headers/{flat_hpp => flat.hpp}/flat_multimap.hpp | 0 headers/{flat_hpp => flat.hpp}/flat_multiset.hpp | 0 headers/{flat_hpp => flat.hpp}/flat_set.hpp | 0 untests/flat_map_tests.cpp | 2 +- untests/flat_multimap_tests.cpp | 2 +- untests/flat_multiset_tests.cpp | 2 +- untests/flat_set_tests.cpp | 2 +- 10 files changed, 5 insertions(+), 20 deletions(-) rename headers/{flat_hpp => flat.hpp}/flat_map.hpp (100%) rename headers/{flat_hpp => flat.hpp}/flat_multimap.hpp (100%) rename headers/{flat_hpp => flat.hpp}/flat_multiset.hpp (100%) rename headers/{flat_hpp => flat.hpp}/flat_set.hpp (100%) diff --git a/.travis.yml b/.travis.yml index 6a22839..8f3cc8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,21 +25,6 @@ matrix: dist: trusty addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-8"], packages: ["xorg-dev", "clang-8", "g++-7"] } } env: MATRIX_EVAL="CC=clang-8 && CXX=clang++-8" - - os: osx - osx_image: xcode9 - compiler: clang - - os: osx - osx_image: xcode9.1 - compiler: clang - - os: osx - osx_image: xcode9.2 - compiler: clang - - os: osx - osx_image: xcode9.3 - compiler: clang - - os: osx - osx_image: xcode9.4 - compiler: clang - os: osx osx_image: xcode10 compiler: clang diff --git a/README.md b/README.md index 8840b64..7a1a839 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ [flat.hpp][flat] is a header-only library. All you need to do is copy the headers files from `headers` directory into your project and include them: ```cpp -#include "flat_hpp/flat_set.hpp" +#include "flat.hpp/flat_set.hpp" using namespace flat_hpp; int main() { diff --git a/headers/flat_hpp/flat_map.hpp b/headers/flat.hpp/flat_map.hpp similarity index 100% rename from headers/flat_hpp/flat_map.hpp rename to headers/flat.hpp/flat_map.hpp diff --git a/headers/flat_hpp/flat_multimap.hpp b/headers/flat.hpp/flat_multimap.hpp similarity index 100% rename from headers/flat_hpp/flat_multimap.hpp rename to headers/flat.hpp/flat_multimap.hpp diff --git a/headers/flat_hpp/flat_multiset.hpp b/headers/flat.hpp/flat_multiset.hpp similarity index 100% rename from headers/flat_hpp/flat_multiset.hpp rename to headers/flat.hpp/flat_multiset.hpp diff --git a/headers/flat_hpp/flat_set.hpp b/headers/flat.hpp/flat_set.hpp similarity index 100% rename from headers/flat_hpp/flat_set.hpp rename to headers/flat.hpp/flat_set.hpp diff --git a/untests/flat_map_tests.cpp b/untests/flat_map_tests.cpp index b880656..ced86ce 100644 --- a/untests/flat_map_tests.cpp +++ b/untests/flat_map_tests.cpp @@ -9,7 +9,7 @@ #include -#include +#include using namespace flat_hpp; namespace diff --git a/untests/flat_multimap_tests.cpp b/untests/flat_multimap_tests.cpp index 3247874..ccaf5bd 100644 --- a/untests/flat_multimap_tests.cpp +++ b/untests/flat_multimap_tests.cpp @@ -9,7 +9,7 @@ #include -#include +#include using namespace flat_hpp; namespace diff --git a/untests/flat_multiset_tests.cpp b/untests/flat_multiset_tests.cpp index db7725b..669d799 100644 --- a/untests/flat_multiset_tests.cpp +++ b/untests/flat_multiset_tests.cpp @@ -9,7 +9,7 @@ #include -#include +#include using namespace flat_hpp; namespace diff --git a/untests/flat_set_tests.cpp b/untests/flat_set_tests.cpp index 480dbeb..6029598 100644 --- a/untests/flat_set_tests.cpp +++ b/untests/flat_set_tests.cpp @@ -9,7 +9,7 @@ #include -#include +#include using namespace flat_hpp; namespace