Commit 57f2e7db authored by Sebastian Eibl's avatar Sebastian Eibl

Merge branch 'libcpp' into 'master'

Silence some libcxx versions' warnings about std::experimental deprecation

See merge request !217
parents babf86a7 f99ac7a2
Pipeline #16640 passed with stages
in 340 minutes and 12 seconds
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#if defined(WALBERLA_USE_STD_ANY) #if defined(WALBERLA_USE_STD_ANY)
#include <any> #include <any>
#elif defined(WALBERLA_USE_STD_EXPERIMENTAL_ANY) #elif defined(WALBERLA_USE_STD_EXPERIMENTAL_ANY)
#undef _LIBCPP_WARN_ON_DEPRECATED_EXPERIMENTAL_HEADER
#include <experimental/any> #include <experimental/any>
#else #else
#include <boost/any.hpp> #include <boost/any.hpp>
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#if defined(WALBERLA_USE_STD_FILESYSTEM) #if defined(WALBERLA_USE_STD_FILESYSTEM)
#include <filesystem> #include <filesystem>
#elif defined(WALBERLA_USE_STD_EXPERIMENTAL_FILESYSTEM) #elif defined(WALBERLA_USE_STD_EXPERIMENTAL_FILESYSTEM)
#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM
#include <experimental/filesystem> #include <experimental/filesystem>
#else #else
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#if defined(WALBERLA_USE_STD_OPTIONAL) #if defined(WALBERLA_USE_STD_OPTIONAL)
#include <optional> #include <optional>
#elif defined(WALBERLA_USE_STD_EXPERIMENTAL_OPTIONAL) #elif defined(WALBERLA_USE_STD_EXPERIMENTAL_OPTIONAL)
#undef _LIBCPP_WARN_ON_DEPRECATED_EXPERIMENTAL_HEADER
#include <experimental/optional> #include <experimental/optional>
#else #else
#include <boost/optional.hpp> #include <boost/optional.hpp>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment