Skip to content

Avoid build break for Visual Studio 2019 v16.3 #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2019
Merged

Avoid build break for Visual Studio 2019 v16.3 #166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions pluginlib/include/pluginlib/impl/filesystem_helper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,7 @@
#define PLUGINLIB__IMPL__FILESYSTEM_HELPER_HPP_


#if defined(_MSC_VER)
# if _MSC_VER >= 1900
# include <experimental/filesystem>
namespace pluginlib
{
namespace impl
{
namespace fs = std::experimental::filesystem;
} // namespace impl
} // namespace pluginlib

# define PLUGINLIB__IMPL__FILESYSYEM_HELPER__HAS_STD_FILESYSTEM
# endif

#elif defined(__has_include)
#if defined(__has_include)
# if __has_include(<filesystem>) && __cplusplus >= 201703L
# include <filesystem>

Expand All @@ -64,6 +50,9 @@ namespace fs = std::filesystem;

# define PLUGINLIB__IMPL__FILESYSYEM_HELPER__HAS_STD_FILESYSTEM
# elif __has_include(<experimental/filesystem>)
// MSVC deprecates <experimental/filesystem> and in favor of <filesystem>
// use this macro to acknowledge this deprecation and unblock the build break
# define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
# include <experimental/filesystem>

namespace pluginlib
Expand Down