Merge pull request #5471 from stastnypremysl/master

Solving problem with g++8 and boost libs:
Project-OSRM · May 28, 2019 · 86aebc0 · 86aebc0
2 parents 817aeac + b4f849a
commit 86aebc0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -121,6 +121,14 @@ matrix:
           packages: ['libstdc++-4.9-dev']
       env: CLANG_VERSION='5.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON RUN_CLANG_FORMAT=ON ENABLE_LTO=ON
 
+    - os: linux
+      compiler: "gcc-8-release"
+      addons: &gcc8
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-8', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libboost-all-dev']
+      env: CCOMPILER='gcc-8' CXXCOMPILER='g++-8' BUILD_TYPE='Release' CXXFLAGS='-Wno-cast-function-type'
+
     - os: linux
       compiler: "gcc-7-release"
       addons: &gcc7

diff --git a/include/storage/shared_datatype.hpp b/include/storage/shared_datatype.hpp
@@ -99,8 +99,8 @@ class BaseDataLayout
         }
     }
 
-    virtual inline void *GetBlockPtr(void *base_ptr, const std::string &name) const = 0;
-    virtual inline std::uint64_t GetSizeOfLayout() const = 0;
+    virtual void *GetBlockPtr(void *base_ptr, const std::string &name) const = 0;
+    virtual std::uint64_t GetSizeOfLayout() const = 0;
 
   protected:
     const Block &GetBlock(const std::string &name) const

diff --git a/src/storage/io_config.cpp b/src/storage/io_config.cpp
@@ -12,10 +12,12 @@ namespace storage
 {
 bool IOConfig::IsValid() const
 {
+    namespace fs = boost::filesystem;
+
     bool success = true;
     for (auto &fileName : required_input_files)
     {
-        if (!boost::filesystem::is_regular_file({base_path.string() + fileName.string()}))
+        if (!fs::is_regular_file(fs::status(base_path.string() + fileName.string())))
         {
             util::Log(logWARNING) << "Missing/Broken File: " << base_path.string()
                                   << fileName.string();
@@ -24,5 +26,5 @@ bool IOConfig::IsValid() const
     }
     return success;
 }
-}
-}
+} // namespace storage
+} // namespace osrm