diff --git a/docs/build.gradle b/docs/build.gradle index 33fa7fc663..e9056a81a4 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -67,9 +67,6 @@ doxygen { cppIncludeRoots << '../ntcore/build/generated/main/native/include/' if (project.hasProperty('docWarningsAsErrors')) { - // C++20 shims - exclude 'wpi/ghc/filesystem.hpp' - // Drake exclude 'drake/common/**' diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt index 9b86e14a3b..2346843034 100644 --- a/wpiutil/CMakeLists.txt +++ b/wpiutil/CMakeLists.txt @@ -146,11 +146,6 @@ target_include_directories(wpiutil PUBLIC $ $) -install(DIRECTORY src/main/native/thirdparty/ghc/include/ DESTINATION "${include_dest}/wpiutil") -target_include_directories(wpiutil PUBLIC - $ - $) - install(DIRECTORY src/main/native/thirdparty/json/include/ DESTINATION "${include_dest}/wpiutil") target_include_directories(wpiutil PUBLIC $ diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle index 501176a206..fa3be0ebb2 100644 --- a/wpiutil/build.gradle +++ b/wpiutil/build.gradle @@ -26,18 +26,13 @@ ext { srcDirs 'src/main/native/thirdparty/fmtlib/include' } } - ghcCpp(CppSourceSet) { - exportedHeaders { - srcDirs 'src/main/native/thirdparty/ghc/include' - } - } jsonCpp(CppSourceSet) { source { srcDirs 'src/main/native/thirdparty/json/cpp' include '*.cpp' } exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/fmtlib/include' + srcDirs 'src/main/native/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/fmtlib/include' } } llvmCpp(CppSourceSet) { @@ -46,7 +41,7 @@ ext { include '**/*.cpp' } exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/ghc/include' + srcDirs 'src/main/native/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include' } } mpackCpp(CppSourceSet) { @@ -67,11 +62,6 @@ ext { srcDirs 'src/main/native/thirdparty/sigslot/include' } } - tcbSpanCpp(CppSourceSet) { - exportedHeaders { - srcDirs 'src/main/native/thirdparty/tcb_span/include' - } - } memoryCpp(CppSourceSet) { source { srcDirs 'src/main/native/thirdparty/memory/src', 'src/main/native/thirdparty/memory/include/wpi/memory' @@ -101,7 +91,7 @@ ext { include '**/*.cpp' } exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/mpack/include' + srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/mpack/include' include '**/*.h' } } @@ -115,7 +105,7 @@ ext { include '**/*.cpp' } exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/mpack/include' + srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/mpack/include' include '**/*.h' } } @@ -128,7 +118,7 @@ ext { include '**/*.cpp' } exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/mpack/include' + srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/mpack/include' include '**/*.h' } } @@ -141,7 +131,7 @@ ext { include '**/*.cpp' } exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/mpack/include' + srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/mpack/include' include '**/*.h' } } @@ -184,9 +174,6 @@ cppHeadersZip { from('src/main/native/thirdparty/fmtlib/include') { into '/' } - from('src/main/native/thirdparty/ghc/include') { - into '/' - } from('src/main/native/thirdparty/json/include') { into '/' } @@ -199,9 +186,6 @@ cppHeadersZip { from('src/main/native/thirdparty/sigslot/include') { into '/' } - from('src/main/native/thirdparty/tcb_span/include') { - into '/' - } from('src/main/native/thirdparty/memory/include') { into '/' } @@ -233,7 +217,7 @@ model { all { it.sources.each { it.exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/ghc/include', 'src/main/native/thirdparty/memory/include', 'src/main/native/thirdparty/mpack/include' + srcDirs 'src/main/native/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/memory/include', 'src/main/native/thirdparty/mpack/include' } } } diff --git a/wpiutil/src/main/native/cpp/fs.cpp b/wpiutil/src/main/native/cpp/fs.cpp index fad6a66d60..ed6829792c 100644 --- a/wpiutil/src/main/native/cpp/fs.cpp +++ b/wpiutil/src/main/native/cpp/fs.cpp @@ -43,26 +43,6 @@ #endif // _WIN32 -#if defined(__APPLE__) -#include -#endif -#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) \ - || (defined(__cplusplus) && __cplusplus >= 201703L)) \ - && defined(__has_include) -#if __has_include() \ - && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) \ - || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) \ - && (defined(__clang__) || !defined(__GNUC__) || __GNUC__ >= 10 \ - || (__GNUC__ >= 9 && __GNUC_MINOR__ >= 1)) -#define GHC_USE_STD_FS -#endif -#endif -#ifndef GHC_USE_STD_FS -// #define GHC_WIN_DISABLE_WSTRING_STORAGE_TYPE -#define GHC_FILESYSTEM_IMPLEMENTATION -#include "wpi/ghc/filesystem.hpp" -#endif - #include "wpi/Errno.h" #include "wpi/ErrorHandling.h" #include "wpi/WindowsError.h"