diff --git a/CMakeLists.txt b/CMakeLists.txt index aba179fd..b393bfda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,7 +118,7 @@ set(LIB_SRC src/api.cpp src/LoadBalancerS2.cpp src/LogarithmicIntegral.cpp src/StatusS2.cpp - src/generate.cpp + src/generate_primes.cpp src/nth_prime.cpp src/phi.cpp src/phi_vector.cpp diff --git a/include/generate.hpp b/include/generate_primes.hpp similarity index 95% rename from include/generate.hpp rename to include/generate_primes.hpp index b2b092cf..e949f775 100644 --- a/include/generate.hpp +++ b/include/generate_primes.hpp @@ -1,5 +1,5 @@ /// -/// @file generate.hpp +/// @file generate_primes.hpp /// /// Copyright (C) 2024 Kim Walisch, /// @@ -7,8 +7,8 @@ /// file in the top level directory. /// -#ifndef GENERATE_HPP -#define GENERATE_HPP +#ifndef GENERATE_PRIMES_HPP +#define GENERATE_PRIMES_HPP #include @@ -17,7 +17,7 @@ namespace primecount { -/// defined in generate.cpp +/// defined in generate_primes.cpp Vector generate_primes_i32(int64_t max); Vector generate_primes_u32(int64_t max); Vector generate_primes_i64(int64_t max); diff --git a/src/P3.cpp b/src/P3.cpp index 8a158743..0c5830e2 100644 --- a/src/P3.cpp +++ b/src/P3.cpp @@ -10,7 +10,7 @@ /// #include -#include +#include #include #include #include diff --git a/src/S1.cpp b/src/S1.cpp index 67f7555b..9bd2fe79 100644 --- a/src/S1.cpp +++ b/src/S1.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/deleglise-rivat/S2_easy.cpp b/src/deleglise-rivat/S2_easy.cpp index cf5ddf39..c2c20be9 100644 --- a/src/deleglise-rivat/S2_easy.cpp +++ b/src/deleglise-rivat/S2_easy.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/deleglise-rivat/S2_easy_libdivide.cpp b/src/deleglise-rivat/S2_easy_libdivide.cpp index 4d074665..6222e550 100644 --- a/src/deleglise-rivat/S2_easy_libdivide.cpp +++ b/src/deleglise-rivat/S2_easy_libdivide.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/deleglise-rivat/S2_hard.cpp b/src/deleglise-rivat/S2_hard.cpp index 393a55c2..1215bfb8 100644 --- a/src/deleglise-rivat/S2_hard.cpp +++ b/src/deleglise-rivat/S2_hard.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/generate.cpp b/src/generate_primes.cpp similarity index 98% rename from src/generate.cpp rename to src/generate_primes.cpp index 1735866c..0b7bc5c8 100644 --- a/src/generate.cpp +++ b/src/generate_primes.cpp @@ -1,5 +1,5 @@ /// -/// @file generate.cpp +/// @file generate_primes.cpp /// /// Copyright (C) 2024 Kim Walisch, /// @@ -7,7 +7,7 @@ /// file in the top level directory. /// -#include +#include #include #include #include diff --git a/src/gourdon/AC.cpp b/src/gourdon/AC.cpp index 6cebee62..cd9ce566 100644 --- a/src/gourdon/AC.cpp +++ b/src/gourdon/AC.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/gourdon/AC_libdivide.cpp b/src/gourdon/AC_libdivide.cpp index 31bee25c..75dab778 100644 --- a/src/gourdon/AC_libdivide.cpp +++ b/src/gourdon/AC_libdivide.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/gourdon/D.cpp b/src/gourdon/D.cpp index ebfa93af..7b3f04b7 100644 --- a/src/gourdon/D.cpp +++ b/src/gourdon/D.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/gourdon/Phi0.cpp b/src/gourdon/Phi0.cpp index bb9be694..2c6b4fc4 100644 --- a/src/gourdon/Phi0.cpp +++ b/src/gourdon/Phi0.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/lmo/pi_lmo1.cpp b/src/lmo/pi_lmo1.cpp index 934a8fe8..17b4c107 100644 --- a/src/lmo/pi_lmo1.cpp +++ b/src/lmo/pi_lmo1.cpp @@ -18,7 +18,7 @@ /// #include -#include +#include #include #include diff --git a/src/lmo/pi_lmo2.cpp b/src/lmo/pi_lmo2.cpp index 042701e6..47f29b21 100644 --- a/src/lmo/pi_lmo2.cpp +++ b/src/lmo/pi_lmo2.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/lmo/pi_lmo3.cpp b/src/lmo/pi_lmo3.cpp index fbb946ff..27a587cf 100644 --- a/src/lmo/pi_lmo3.cpp +++ b/src/lmo/pi_lmo3.cpp @@ -16,7 +16,7 @@ /// #include -#include +#include #include #include #include diff --git a/src/lmo/pi_lmo4.cpp b/src/lmo/pi_lmo4.cpp index 3f1d49e8..b4debe1f 100644 --- a/src/lmo/pi_lmo4.cpp +++ b/src/lmo/pi_lmo4.cpp @@ -18,7 +18,7 @@ /// #include -#include +#include #include #include #include diff --git a/src/lmo/pi_lmo5.cpp b/src/lmo/pi_lmo5.cpp index 355f3324..c46a9786 100644 --- a/src/lmo/pi_lmo5.cpp +++ b/src/lmo/pi_lmo5.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/lmo/pi_lmo_parallel.cpp b/src/lmo/pi_lmo_parallel.cpp index 4cd72dfb..c8d962ab 100644 --- a/src/lmo/pi_lmo_parallel.cpp +++ b/src/lmo/pi_lmo_parallel.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/phi.cpp b/src/phi.cpp index 6d5a444f..c774652f 100644 --- a/src/phi.cpp +++ b/src/phi.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/test/P2.cpp b/test/P2.cpp index 4c35f59a..80cf3880 100644 --- a/test/P2.cpp +++ b/test/P2.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/test/P3.cpp b/test/P3.cpp index 328ab29d..4cb02ea8 100644 --- a/test/P3.cpp +++ b/test/P3.cpp @@ -11,7 +11,7 @@ /// #include -#include +#include #include #include diff --git a/test/deleglise-rivat/S2.cpp b/test/deleglise-rivat/S2.cpp index 2fd29a65..3ee0f5f7 100644 --- a/test/deleglise-rivat/S2.cpp +++ b/test/deleglise-rivat/S2.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/test/deleglise-rivat/S2_easy.cpp b/test/deleglise-rivat/S2_easy.cpp index b7b80d40..ff8cf07a 100644 --- a/test/deleglise-rivat/S2_easy.cpp +++ b/test/deleglise-rivat/S2_easy.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/deleglise-rivat/S2_hard.cpp b/test/deleglise-rivat/S2_hard.cpp index ea531f83..ef1b2185 100644 --- a/test/deleglise-rivat/S2_hard.cpp +++ b/test/deleglise-rivat/S2_hard.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/test/deleglise-rivat/S2_trivial.cpp b/test/deleglise-rivat/S2_trivial.cpp index 039a9f9d..144c64f6 100644 --- a/test/deleglise-rivat/S2_trivial.cpp +++ b/test/deleglise-rivat/S2_trivial.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/test/generate_lpf.cpp b/test/generate_lpf.cpp index eabe7ffd..ce157a9c 100644 --- a/test/generate_lpf.cpp +++ b/test/generate_lpf.cpp @@ -8,7 +8,7 @@ /// file in the top level directory. /// -#include +#include #include #include diff --git a/test/generate_pi.cpp b/test/generate_pi.cpp index 7053ba2e..6b5a62d4 100644 --- a/test/generate_pi.cpp +++ b/test/generate_pi.cpp @@ -9,7 +9,7 @@ /// file in the top level directory. /// -#include +#include #include #include diff --git a/test/gourdon/FactorTableD.cpp b/test/gourdon/FactorTableD.cpp index 3202b3d9..93f34f2b 100644 --- a/test/gourdon/FactorTableD.cpp +++ b/test/gourdon/FactorTableD.cpp @@ -14,7 +14,7 @@ #define ENABLE_MU_0_TESTING #include -#include +#include #include #include diff --git a/test/lmo/BinaryIndexedTree.cpp b/test/lmo/BinaryIndexedTree.cpp index 4d827b1b..ba3f74ab 100644 --- a/test/lmo/BinaryIndexedTree.cpp +++ b/test/lmo/BinaryIndexedTree.cpp @@ -11,7 +11,7 @@ /// #include -#include +#include #include #include diff --git a/test/lmo/FactorTable.cpp b/test/lmo/FactorTable.cpp index 3ad76eff..08bebe7a 100644 --- a/test/lmo/FactorTable.cpp +++ b/test/lmo/FactorTable.cpp @@ -14,7 +14,7 @@ #define ENABLE_MU_0_TESTING #include -#include +#include #include #include diff --git a/test/lmo/S1.cpp b/test/lmo/S1.cpp index c33ae7e4..777f9027 100644 --- a/test/lmo/S1.cpp +++ b/test/lmo/S1.cpp @@ -11,7 +11,7 @@ /// #include -#include +#include #include #include #include diff --git a/test/moebius.cpp b/test/moebius.cpp index a2c60ba2..f1a7015d 100644 --- a/test/moebius.cpp +++ b/test/moebius.cpp @@ -9,7 +9,7 @@ /// file in the top level directory. /// -#include +#include #include #include diff --git a/test/phi_tiny.cpp b/test/phi_tiny.cpp index fcb3f3e3..5aa859de 100644 --- a/test/phi_tiny.cpp +++ b/test/phi_tiny.cpp @@ -11,7 +11,7 @@ /// #include -#include +#include #include #include diff --git a/test/phi_vector.cpp b/test/phi_vector.cpp index 3e3db066..ba2425b9 100644 --- a/test/phi_vector.cpp +++ b/test/phi_vector.cpp @@ -10,7 +10,7 @@ /// #include -#include +#include #include #include #include diff --git a/test/sieve1.cpp b/test/sieve1.cpp index f230cd96..2d2dd58b 100644 --- a/test/sieve1.cpp +++ b/test/sieve1.cpp @@ -11,7 +11,7 @@ /// #include -#include +#include #include #include diff --git a/test/sieve2.cpp b/test/sieve2.cpp index d3b5448d..7c86bff7 100644 --- a/test/sieve2.cpp +++ b/test/sieve2.cpp @@ -12,7 +12,7 @@ /// #include -#include +#include #include #include