diff --git a/benchmark/baseline.cpp b/benchmark/baseline.cpp index 8da6a20d0d..02ab2d3597 100644 --- a/benchmark/baseline.cpp +++ b/benchmark/baseline.cpp @@ -40,8 +40,7 @@ For more information, please refer to */ #include -#include -#include +import std; namespace fcarouge::benchmark { namespace { diff --git a/benchmark/eigen_predict_x1x.cpp b/benchmark/eigen_predict_x1x.cpp index eaa27078dc..608611ec2e 100644 --- a/benchmark/eigen_predict_x1x.cpp +++ b/benchmark/eigen_predict_x1x.cpp @@ -43,13 +43,7 @@ For more information, please refer to */ #include #include -#include -#include -#include -#include -#include -#include -#include +import std; namespace fcarouge::benchmark { namespace { diff --git a/benchmark/eigen_update_xx0.cpp b/benchmark/eigen_update_xx0.cpp index 4ba1ac89c6..134cac03c5 100644 --- a/benchmark/eigen_update_xx0.cpp +++ b/benchmark/eigen_update_xx0.cpp @@ -43,13 +43,7 @@ For more information, please refer to */ #include #include -#include -#include -#include -#include -#include -#include -#include +import std; namespace fcarouge::benchmark { namespace { diff --git a/benchmark/include/benchmark.hpp b/benchmark/include/benchmark.hpp index e2ff88c6a8..5dc40a28e4 100644 --- a/benchmark/include/benchmark.hpp +++ b/benchmark/include/benchmark.hpp @@ -42,8 +42,7 @@ For more information, please refer to */ //! @file //! @brief Benchmarking support. -#include -#include +import std; namespace fcarouge::benchmark { diff --git a/benchmark/predict_1x1x0.cpp b/benchmark/predict_1x1x0.cpp index f91dcffd06..cea14fef49 100644 --- a/benchmark/predict_1x1x0.cpp +++ b/benchmark/predict_1x1x0.cpp @@ -41,8 +41,7 @@ For more information, please refer to */ #include -#include -#include +import std; namespace fcarouge::benchmark { namespace { diff --git a/benchmark/predict_1x1x1.cpp b/benchmark/predict_1x1x1.cpp index 2da352fb7e..f673bc3728 100644 --- a/benchmark/predict_1x1x1.cpp +++ b/benchmark/predict_1x1x1.cpp @@ -41,9 +41,7 @@ For more information, please refer to */ #include -#include -#include -#include +import std; namespace fcarouge::benchmark { namespace { diff --git a/benchmark/update_1x1x0.cpp b/benchmark/update_1x1x0.cpp index f5a38dd175..3eca17f363 100644 --- a/benchmark/update_1x1x0.cpp +++ b/benchmark/update_1x1x0.cpp @@ -41,9 +41,7 @@ For more information, please refer to */ #include -#include -#include -#include +import std; namespace fcarouge::benchmark { namespace { diff --git a/benchmark/update_1x1x1.cpp b/benchmark/update_1x1x1.cpp index 349f3dc336..7f41685953 100644 --- a/benchmark/update_1x1x1.cpp +++ b/benchmark/update_1x1x1.cpp @@ -41,9 +41,7 @@ For more information, please refer to */ #include -#include -#include -#include +import std; namespace fcarouge::benchmark { namespace { diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 9aa25c3ae6..7b1de0ed17 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -37,7 +37,7 @@ OTHER DEALINGS IN THE SOFTWARE. For more information, please refer to ]] if(WIN32) - set(OPTIONS "/EHsc" "/W4") + set(OPTIONS "/EHsc" "/W4" "/experimental:module" "/std:c++latest") else() set(LIBRARIES kalman_format) set(OPTIONS @@ -45,6 +45,7 @@ else() "-fno-check-new" "-fno-common" "-fstrict-aliasing" + "-fmodules-ts" "-pedantic" "-Wall" "-Wcast-align" diff --git a/include/fcarouge/internal/format.hpp b/include/fcarouge/internal/format.hpp index 90e1a0055a..23242dc9f4 100644 --- a/include/fcarouge/internal/format.hpp +++ b/include/fcarouge/internal/format.hpp @@ -41,8 +41,7 @@ For more information, please refer to */ #include "utility.hpp" -#include -#include +import std; namespace fcarouge { template diff --git a/include/fcarouge/internal/kalman.hpp b/include/fcarouge/internal/kalman.hpp index e7f98b0cae..84297c3a34 100644 --- a/include/fcarouge/internal/kalman.hpp +++ b/include/fcarouge/internal/kalman.hpp @@ -41,9 +41,7 @@ For more information, please refer to */ #include "utility.hpp" -#include -#include -#include +import std; namespace fcarouge::internal { diff --git a/include/fcarouge/internal/utility.hpp b/include/fcarouge/internal/utility.hpp index 79f0e3948f..a0cc13fb2b 100644 --- a/include/fcarouge/internal/utility.hpp +++ b/include/fcarouge/internal/utility.hpp @@ -39,8 +39,7 @@ For more information, please refer to */ #ifndef FCAROUGE_INTERNAL_UTILITY_HPP #define FCAROUGE_INTERNAL_UTILITY_HPP -#include -#include +import std; namespace fcarouge::internal { diff --git a/include/fcarouge/kalman.hpp b/include/fcarouge/kalman.hpp index 9ee583549e..9f53513ef2 100644 --- a/include/fcarouge/kalman.hpp +++ b/include/fcarouge/kalman.hpp @@ -46,11 +46,7 @@ For more information, please refer to */ #include "internal/kalman.hpp" #include "internal/utility.hpp" -#include -#include -#include -#include -#include +import std; namespace fcarouge { diff --git a/sample/ekf_4x1x0_soaring.cpp b/sample/ekf_4x1x0_soaring.cpp index 9e724a3e0b..64372a066a 100644 --- a/sample/ekf_4x1x0_soaring.cpp +++ b/sample/ekf_4x1x0_soaring.cpp @@ -3,7 +3,8 @@ #include #include -#include + +import std; namespace fcarouge::sample { namespace { diff --git a/sample/kf_1x1x0_building_height.cpp b/sample/kf_1x1x0_building_height.cpp index 42fbcc3a4a..38e29714c2 100644 --- a/sample/kf_1x1x0_building_height.cpp +++ b/sample/kf_1x1x0_building_height.cpp @@ -2,6 +2,8 @@ #include +import std; + namespace fcarouge::sample { namespace { //! @brief Estimating the height of a building. diff --git a/sample/kf_1x1x0_liquid_temperature.cpp b/sample/kf_1x1x0_liquid_temperature.cpp index 6d8cb1f851..4a79706e26 100644 --- a/sample/kf_1x1x0_liquid_temperature.cpp +++ b/sample/kf_1x1x0_liquid_temperature.cpp @@ -1,7 +1,8 @@ #include "fcarouge/kalman.hpp" #include -#include + +import std; namespace fcarouge::sample { namespace { diff --git a/sample/kf_1x1x1_dog_position.cpp b/sample/kf_1x1x1_dog_position.cpp index 1666113d8b..be1f09b783 100644 --- a/sample/kf_1x1x1_dog_position.cpp +++ b/sample/kf_1x1x1_dog_position.cpp @@ -1,7 +1,8 @@ #include "fcarouge/kalman.hpp" #include -#include + +import std; namespace fcarouge::sample { namespace { diff --git a/sample/kf_2x1x1_rocket_altitude.cpp b/sample/kf_2x1x1_rocket_altitude.cpp index 1c36f469b7..54f198e845 100644 --- a/sample/kf_2x1x1_rocket_altitude.cpp +++ b/sample/kf_2x1x1_rocket_altitude.cpp @@ -3,8 +3,8 @@ #include #include -#include -#include + +import std; namespace fcarouge::sample { namespace { diff --git a/sample/kf_6x2x0_vehicle_location.cpp b/sample/kf_6x2x0_vehicle_location.cpp index 08978ce6a5..da047cd2b2 100644 --- a/sample/kf_6x2x0_vehicle_location.cpp +++ b/sample/kf_6x2x0_vehicle_location.cpp @@ -3,7 +3,8 @@ #include #include -#include + +import std; namespace fcarouge::sample { namespace { diff --git a/sample/kf_8x4x0_deep_sort_bounding_box.cpp b/sample/kf_8x4x0_deep_sort_bounding_box.cpp index 5b1f0d1272..e618ca32ca 100644 --- a/sample/kf_8x4x0_deep_sort_bounding_box.cpp +++ b/sample/kf_8x4x0_deep_sort_bounding_box.cpp @@ -3,7 +3,8 @@ #include #include -#include + +import std; namespace fcarouge::sample { namespace { diff --git a/support/format b/support/format index c662635958..88840dbd19 100644 --- a/support/format +++ b/support/format @@ -54,10 +54,7 @@ For more information, please refer to */ #include #include -#include -#include -#include -#include +import std; namespace fcarouge { template diff --git a/test/format.cpp b/test/format.cpp index 778e75250c..5f2269a7f8 100644 --- a/test/format.cpp +++ b/test/format.cpp @@ -39,7 +39,8 @@ For more information, please refer to */ #include "fcarouge/kalman.hpp" #include -#include + +import std; namespace fcarouge::test { namespace {