Merge pull request #55 from atcoder/patch/issue53

yosupo06 · web-flow · commit 7b2a392992c0 · 2020-09-25T02:55:57.000+09:00
fix #53: `#include <intrin.h>` is missing from internal_math.hpp
diff --git a/atcoder/internal_math.hpp b/atcoder/internal_math.hpp
@@ -3,6 +3,10 @@
 
 #include <utility>
 
+#ifdef _MSC_VER
+#include <intrin.h>
+#endif
+
 namespace atcoder {
 
 namespace internal {
diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt
@@ -54,10 +54,6 @@ add_executable(ModintTest modint_test.cpp)
 target_link_libraries(ModintTest gtest gtest_main)
 gtest_discover_tests(ModintTest)
 
-add_executable(MatrixTest matrix_test.cpp)
-target_link_libraries(MatrixTest gtest gtest_main)
-gtest_discover_tests(MatrixTest)
-
 add_executable(DSUTest dsu_test.cpp)
 target_link_libraries(DSUTest gtest gtest_main)
 gtest_discover_tests(DSUTest)
diff --git a/test/unittest/basic_test.cpp b/test/unittest/basic_test.cpp
@@ -1,8 +1,8 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/all>
 #include <type_traits>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using uint = unsigned int;
 using ll = long long;
diff --git a/test/unittest/bit_test.cpp b/test/unittest/bit_test.cpp
@@ -1,8 +1,8 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/internal_bit>
 #include <numeric>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using ll = long long;
 using ull = unsigned long long;
diff --git a/test/unittest/convolution_test.cpp b/test/unittest/convolution_test.cpp
@@ -1,10 +1,10 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/convolution>
 #include <atcoder/modint>
 #include <random>
 #include "../utils/random.hpp"
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using uint = unsigned int;
 using ll = long long;
diff --git a/test/unittest/dsu_test.cpp b/test/unittest/dsu_test.cpp
@@ -1,8 +1,8 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/dsu>
 #include <numeric>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using ll = long long;
 using ull = unsigned long long;
diff --git a/test/unittest/fenwicktree_test.cpp b/test/unittest/fenwicktree_test.cpp
@@ -1,9 +1,9 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/fenwicktree>
 #include <atcoder/modint>
 #include <numeric>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using ll = long long;
 using ull = unsigned long long;
diff --git a/test/unittest/internal_math_test.cpp b/test/unittest/internal_math_test.cpp
@@ -1,9 +1,9 @@
 #include <gtest/gtest.h>
-
-#include <atcoder/internal_math>
 #include <numeric>
 #include "../utils/math.hpp"
 
+#include <atcoder/internal_math>
+
 using namespace atcoder;
 using uint = unsigned int;
 using ll = long long;
diff --git a/test/unittest/lazysegtree_stress_test.cpp b/test/unittest/lazysegtree_stress_test.cpp
@@ -1,11 +1,11 @@
-#include <gtest/gtest.h>
-
 #include <algorithm>
 #include <atcoder/lazysegtree>
 #include "../utils/random.hpp"
 #include <string>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 
 // time manager
diff --git a/test/unittest/lazysegtree_test.cpp b/test/unittest/lazysegtree_test.cpp
@@ -1,10 +1,10 @@
-#include <gtest/gtest.h>
-
 #include <algorithm>
 #include <atcoder/lazysegtree>
 #include <string>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 struct starry {
     static int op_ss(int a, int b) { return std::max(a, b); }
diff --git a/test/unittest/math_test.cpp b/test/unittest/math_test.cpp
@@ -1,8 +1,8 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/math>
 #include <numeric>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using uint = unsigned int;
 using ll = long long;
diff --git a/test/unittest/matrix_test.cpp b/test/unittest/matrix_test.cpp
diff --git a/test/unittest/maxflow_test.cpp b/test/unittest/maxflow_test.cpp
@@ -1,11 +1,11 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/maxflow>
 #include <numeric>
 #include <tuple>
 #include <vector>
 #include "../utils/random.hpp"
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using ll = long long;
 using ull = unsigned long long;
diff --git a/test/unittest/mincostflow_test.cpp b/test/unittest/mincostflow_test.cpp
@@ -1,10 +1,10 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/mincostflow>
 #include <numeric>
 #include <tuple>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using ll = long long;
 using ull = unsigned long long;
diff --git a/test/unittest/modint_test.cpp b/test/unittest/modint_test.cpp
@@ -1,8 +1,8 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/modint>
 #include <type_traits>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using ll = long long;
 
diff --git a/test/unittest/scc_test.cpp b/test/unittest/scc_test.cpp
@@ -1,9 +1,9 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/scc>
 #include <atcoder/modint>
 #include <numeric>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using ll = long long;
 using ull = unsigned long long;
diff --git a/test/unittest/segtree_test.cpp b/test/unittest/segtree_test.cpp
@@ -1,9 +1,9 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/segtree>
 #include <string>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 
 template <class S, S (*op)(S, S), S (*e)()> struct segtree_naive {
diff --git a/test/unittest/string_test.cpp b/test/unittest/string_test.cpp
@@ -1,10 +1,10 @@
-#include <gtest/gtest.h>
-
 #include <algorithm>
 #include <atcoder/string>
 #include <numeric>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using ll = long long;
 using ull = unsigned long long;
diff --git a/test/unittest/twosat_test.cpp b/test/unittest/twosat_test.cpp
@@ -1,10 +1,9 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/twosat>
 #include <numeric>
-
 #include "../utils/random.hpp"
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using ll = long long;
 using ull = unsigned long long;
diff --git a/test/unittest/type_traits_test.cpp b/test/unittest/type_traits_test.cpp
@@ -1,8 +1,8 @@
-#include <gtest/gtest.h>
-
 #include <atcoder/internal_type_traits>
 #include <type_traits>
 
+#include <gtest/gtest.h>
+
 using namespace atcoder;
 using namespace std;
 using ll = long long;
@@ -91,11 +91,13 @@ static_assert(internal::is_unsigned_int<__uint128_t>::value, "");
 static_assert(!internal::is_unsigned_int<__int128>::value, "");
 static_assert(internal::is_unsigned_int<unsigned __int128>::value, "");
 
-static_assert(std::is_same<__uint128_t,
-                           internal::make_unsigned_int128<__int128_t>::type>::value,
-              "");
-static_assert(std::is_same<unsigned __int128,
-                           internal::make_unsigned_int128<__int128>::type>::value,
-              "");
+static_assert(
+    std::is_same<__uint128_t,
+                 internal::make_unsigned_int128<__int128_t>::type>::value,
+    "");
+static_assert(
+    std::is_same<unsigned __int128,
+                 internal::make_unsigned_int128<__int128>::type>::value,
+    "");
 
 #endif
