[module] import standard module support

FrancoisCarouge · Dec 18, 2022 · 4bea627 · 4bea627
1 parent 71c12b6
commit 4bea627
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 54 deletions.
diff --git a/benchmark/baseline.cpp b/benchmark/baseline.cpp
@@ -40,8 +40,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
+import std;
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/benchmark/eigen_predict_x1x.cpp b/benchmark/eigen_predict_x1x.cpp
@@ -43,13 +43,7 @@ For more information, please refer to <https://unlicense.org> */
 #include <Eigen/Eigen>
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <random>
+import std;
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/benchmark/eigen_update_xx0.cpp b/benchmark/eigen_update_xx0.cpp
@@ -43,13 +43,7 @@ For more information, please refer to <https://unlicense.org> */
 #include <Eigen/Eigen>
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <random>
+import std;
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/benchmark/include/benchmark.hpp b/benchmark/include/benchmark.hpp
@@ -42,8 +42,7 @@ For more information, please refer to <https://unlicense.org> */
 //! @file
 //! @brief Benchmarking support.
 
-#include <chrono>
-#include <type_traits>
+import std;
 
 namespace fcarouge::benchmark {
 

diff --git a/benchmark/predict_1x1x0.cpp b/benchmark/predict_1x1x0.cpp
@@ -41,8 +41,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
+import std;
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/benchmark/predict_1x1x1.cpp b/benchmark/predict_1x1x1.cpp
@@ -41,9 +41,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
-#include <random>
+import std;
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/benchmark/update_1x1x0.cpp b/benchmark/update_1x1x0.cpp
@@ -41,9 +41,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
-#include <random>
+import std;
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/benchmark/update_1x1x1.cpp b/benchmark/update_1x1x1.cpp
@@ -41,9 +41,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
-#include <random>
+import std;
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -37,14 +37,15 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <https://unlicense.org> ]]
 
 if(WIN32)
-  set(OPTIONS "/EHsc" "/W4")
+  set(OPTIONS "/EHsc" "/W4" "/experimental:module" "/std:c++latest")
 else()
   set(LIBRARIES kalman_format)
   set(OPTIONS
       "-ansi"
       "-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
@@ -41,8 +41,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include "utility.hpp"
 
-#include <cstddef>
-#include <format>
+import std;
 
 namespace fcarouge {
 template <typename, typename, typename, typename, typename, typename>

diff --git a/include/fcarouge/internal/kalman.hpp b/include/fcarouge/internal/kalman.hpp
@@ -41,9 +41,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include "utility.hpp"
 
-#include <functional>
-#include <tuple>
-#include <type_traits>
+import std;
 
 namespace fcarouge::internal {
 

diff --git a/include/fcarouge/internal/utility.hpp b/include/fcarouge/internal/utility.hpp
@@ -39,8 +39,7 @@ For more information, please refer to <https://unlicense.org> */
 #ifndef FCAROUGE_INTERNAL_UTILITY_HPP
 #define FCAROUGE_INTERNAL_UTILITY_HPP
 
-#include <concepts>
-#include <type_traits>
+import std;
 
 namespace fcarouge::internal {
 

diff --git a/include/fcarouge/kalman.hpp b/include/fcarouge/kalman.hpp
@@ -46,11 +46,7 @@ For more information, please refer to <https://unlicense.org> */
 #include "internal/kalman.hpp"
 #include "internal/utility.hpp"
 
-#include <concepts>
-#include <cstddef>
-#include <functional>
-#include <type_traits>
-#include <utility>
+import std;
 
 namespace fcarouge {
 

diff --git a/sample/ekf_4x1x0_soaring.cpp b/sample/ekf_4x1x0_soaring.cpp
@@ -3,7 +3,8 @@
 #include <Eigen/Eigen>
 
 #include <cassert>
-#include <cmath>
+
+import std;
 
 namespace fcarouge::sample {
 namespace {

diff --git a/sample/kf_1x1x0_building_height.cpp b/sample/kf_1x1x0_building_height.cpp
@@ -2,6 +2,8 @@
 
 #include <cassert>
 
+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
@@ -1,7 +1,8 @@
 #include "fcarouge/kalman.hpp"
 
 #include <cassert>
-#include <cmath>
+
+import std;
 
 namespace fcarouge::sample {
 namespace {

diff --git a/sample/kf_1x1x1_dog_position.cpp b/sample/kf_1x1x1_dog_position.cpp
@@ -1,7 +1,8 @@
 #include "fcarouge/kalman.hpp"
 
 #include <cassert>
-#include <cmath>
+
+import std;
 
 namespace fcarouge::sample {
 namespace {

diff --git a/sample/kf_2x1x1_rocket_altitude.cpp b/sample/kf_2x1x1_rocket_altitude.cpp
@@ -3,8 +3,8 @@
 #include <Eigen/Eigen>
 
 #include <cassert>
-#include <chrono>
-#include <cmath>
+
+import std;
 
 namespace fcarouge::sample {
 namespace {

diff --git a/sample/kf_6x2x0_vehicle_location.cpp b/sample/kf_6x2x0_vehicle_location.cpp
@@ -3,7 +3,8 @@
 #include <Eigen/Eigen>
 
 #include <cassert>
-#include <cmath>
+
+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
@@ -3,7 +3,8 @@
 #include <Eigen/Eigen>
 
 #include <cassert>
-#include <cmath>
+
+import std;
 
 namespace fcarouge::sample {
 namespace {

diff --git a/support/format b/support/format
@@ -54,10 +54,7 @@ For more information, please refer to <https://unlicense.org> */
 #include <fmt/ranges.h>
 #include <fmt/xchar.h>
 
-#include <cstdio>
-#include <locale>
-#include <string>
-#include <string_view>
+import std;
 
 namespace fcarouge {
 template <typename, typename, typename, typename, typename, typename>

diff --git a/test/format.cpp b/test/format.cpp
@@ -39,7 +39,8 @@ For more information, please refer to <https://unlicense.org> */
 #include "fcarouge/kalman.hpp"
 
 #include <cassert>
-#include <format>
+
+import std;
 
 namespace fcarouge::test {
 namespace {