Merge pull request #812 from johnmcfarlane/system-header-shadows

johnmcfarlane · web-flow · commit 18ea87f0b5a2 · 2021-03-18T00:36:58.000Z
System header shadows
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,6 +1,7 @@
 ---
 Checks: >
-  *,
+  -*,
+  llvm-include-order,
   -llvmlibc-*,
   -clang-analyzer-osx.*,
   -cppcoreguidelines-pro-bounds-constant-array-index,
diff --git a/include/cnl/_impl/cnl_assert.h b/include/cnl/_impl/cnl_assert.h
diff --git a/include/cnl/_impl/duplex_integer/digits.h b/include/cnl/_impl/duplex_integer/digits.h
@@ -7,7 +7,7 @@
 #if !defined(CNL_IMPL_DUPLEX_INTEGER_DIGITS_H)
 #define CNL_IMPL_DUPLEX_INTEGER_DIGITS_H
 
-#include "../assert.h"
+#include "../cnl_assert.h"
 #include "../num_traits/digits.h"
 #include "forward_declaration.h"
 #include "remove_signedness.h"
diff --git a/include/cnl/_impl/duplex_integer/numeric_limits.h b/include/cnl/_impl/duplex_integer/numeric_limits.h
@@ -7,7 +7,7 @@
 #if !defined(CNL_IMPL_DUPLEX_INTEGER_NUMERIC_LIMITS_H)
 #define CNL_IMPL_DUPLEX_INTEGER_NUMERIC_LIMITS_H
 
-#include "../../limits.h"
+#include "../../numeric_limits.h"
 #include "../num_traits/from_rep.h"
 #include "ctors.h"
 #include "forward_declaration.h"
diff --git a/include/cnl/_impl/elastic_integer/numeric_limits.h b/include/cnl/_impl/elastic_integer/numeric_limits.h
@@ -7,7 +7,7 @@
 #if !defined(CNL_IMPL_ELASTIC_INTEGER_LIMITS_H)
 #define CNL_IMPL_ELASTIC_INTEGER_LIMITS_H
 
-#include "../../limits.h"
+#include "../../numeric_limits.h"
 #include "../limits/lowest.h"
 #include "definition.h"
 #include "from_rep.h"
diff --git a/include/cnl/_impl/fraction/make_fraction.h b/include/cnl/_impl/fraction/make_fraction.h
@@ -7,8 +7,8 @@
 #if !defined(CNL_IMPL_FRACTION_MAKE_FRACTION_H)
 #define CNL_IMPL_FRACTION_MAKE_FRACTION_H
 
-#include "../../limits.h"
-#include "../assert.h"
+#include "../../numeric_limits.h"
+#include "../cnl_assert.h"
 #include "../type_traits/enable_if.h"
 #include "../type_traits/remove_signedness.h"
 #include "type.h"
diff --git a/include/cnl/_impl/fraction/type.h b/include/cnl/_impl/fraction/type.h
@@ -11,6 +11,7 @@
 #include "../type_traits/enable_if.h"
 #include "../type_traits/is_integral.h"
 
+#include <climits>
 #include <type_traits>
 
 /// compositional numeric library
diff --git a/include/cnl/_impl/num_traits/digits.h b/include/cnl/_impl/num_traits/digits.h
@@ -17,6 +17,7 @@
 #include "../used_digits.h"
 #include "is_composite.h"
 
+#include <climits>
 #include <type_traits>
 
 namespace cnl {
diff --git a/include/cnl/_impl/num_traits/set_digits.h b/include/cnl/_impl/num_traits/set_digits.h
@@ -10,7 +10,7 @@
 #if !defined(CNL_IMPL_NUM_TRAITS_SET_DIGITS)
 #define CNL_IMPL_NUM_TRAITS_SET_DIGITS
 
-#include "../../limits.h"
+#include "../../numeric_limits.h"
 #include "../type_traits/enable_if.h"
 #include "../type_traits/is_integral.h"
 
diff --git a/include/cnl/_impl/number/numeric_limits.h b/include/cnl/_impl/number/numeric_limits.h
@@ -7,7 +7,7 @@
 #if !defined(CNL_IMPL_NUMBER_NUMERIC_LIMITS_H)
 #define CNL_IMPL_NUMBER_NUMERIC_LIMITS_H
 
-#include "../../limits.h"
+#include "../../numeric_limits.h"
 #include "definition.h"
 
 /// compositional numeric library
diff --git a/include/cnl/_impl/operators/overloads.h b/include/cnl/_impl/operators/overloads.h
@@ -10,7 +10,7 @@
 #if !defined(CNL_IMPL_OPERATORS_OVERLOADS_H)
 #define CNL_IMPL_OPERATORS_OVERLOADS_H
 
-#include "../../limits.h"
+#include "../../numeric_limits.h"
 #include "../type_traits/enable_if.h"
 #include "generic.h"
 
diff --git a/include/cnl/_impl/overflow/is_overflow.h b/include/cnl/_impl/overflow/is_overflow.h
@@ -7,8 +7,8 @@
 #if !defined(CNL_IMPL_OVERFLOW_IS_OVERFLOW_H)
 #define CNL_IMPL_OVERFLOW_IS_OVERFLOW_H
 
-#include "../../limits.h"
 #include "../../numeric.h"
+#include "../../numeric_limits.h"
 #include "../num_traits/digits.h"
 #include "../operators/operators.h"
 #include "../polarity.h"
diff --git a/include/cnl/_impl/rounding/convert_operator.h b/include/cnl/_impl/rounding/convert_operator.h
@@ -7,7 +7,7 @@
 #if !defined(CNL_IMPL_ROUNDING_TAGGED_CONVERT_OPERATOR_H)
 #define CNL_IMPL_ROUNDING_TAGGED_CONVERT_OPERATOR_H
 
-#include "../../limits.h"
+#include "../../numeric_limits.h"
 #include "../operators/native_tag.h"
 #include "../type_traits/enable_if.h"
 #include "native_rounding_tag.h"
diff --git a/include/cnl/_impl/scaled_integer/declaration.h b/include/cnl/_impl/scaled_integer/declaration.h
@@ -7,7 +7,7 @@
 #if !defined(CNL_IMPL_SCALED_INTEGER_DECLARATION_H)
 #define CNL_IMPL_SCALED_INTEGER_DECLARATION_H
 
-#include "../../limits.h"
+#include "../../numeric_limits.h"
 #include "../scaled/declaration.h"
 
 /// compositional numeric library
diff --git a/include/cnl/_impl/scaled_integer/extras.h b/include/cnl/_impl/scaled_integer/extras.h
@@ -22,6 +22,7 @@
 #include "to_chars.h"
 #include "type.h"
 
+#include <climits>
 #include <cmath>
 #if defined(CNL_IOSTREAM_ENABLED)
 #include <istream>
diff --git a/include/cnl/_impl/scaled_integer/to_chars.h b/include/cnl/_impl/scaled_integer/to_chars.h
@@ -8,7 +8,7 @@
 #define CNL_IMPL_SCALED_INTEGER_TO_CHARS_H
 
 #include "../../rounding_integer.h"
-#include "../assert.h"
+#include "../cnl_assert.h"
 #include "../num_traits/fixed_width_scale.h"
 #include "../to_chars.h"
 #include "num_traits.h"
diff --git a/include/cnl/_impl/to_chars.h b/include/cnl/_impl/to_chars.h
@@ -7,7 +7,7 @@
 #if !defined(CNL_IMPL_TO_CHARS_H)
 #define CNL_IMPL_TO_CHARS_H
 
-#include "assert.h"  // NOLINT(modernize-deprecated-headers,  hicpp-deprecated-headers)
+#include "cnl_assert.h"
 #include "num_traits/digits.h"
 #include "num_traits/rounding.h"
 #include "type_traits/is_signed.h"
diff --git a/include/cnl/_impl/wide_integer/numeric_limits.h b/include/cnl/_impl/wide_integer/numeric_limits.h
@@ -7,7 +7,7 @@
 #if !defined(CNL_IMPL_WIDE_INTEGER_NUMERIC_LIMITS_H)
 #define CNL_IMPL_WIDE_INTEGER_NUMERIC_LIMITS_H
 
-#include "../../limits.h"
+#include "../../numeric_limits.h"
 #include "../duplex_integer.h"
 #include "../limits/lowest.h"
 #include "../num_traits/rep.h"
diff --git a/include/cnl/all.h b/include/cnl/all.h
@@ -109,10 +109,10 @@
 #include "elastic_scaled_integer.h"
 #include "fixed_point.h"
 #include "fraction.h"
-#include "limits.h"  // NOLINT(modernize-deprecated-headers,  hicpp-deprecated-headers)
 #include "num_traits.h"
 #include "numbers.h"
 #include "numeric.h"
+#include "numeric_limits.h"
 #include "overflow.h"
 #include "overflow_integer.h"
 #include "rounding.h"
diff --git a/include/cnl/constant.h b/include/cnl/constant.h
@@ -10,9 +10,9 @@
 #if !defined(CNL_CONSTANT_H)
 #define CNL_CONSTANT_H
 
-#include "_impl/assert.h"
+#include "_impl/cnl_assert.h"
 #include "cstdint.h"
-#include "limits.h"  // NOLINT(modernize-deprecated-headers,  hicpp-deprecated-headers)
+#include "numeric_limits.h"
 
 #include <type_traits>
 
diff --git a/include/cnl/elastic_fixed_point.h b/include/cnl/elastic_fixed_point.h
@@ -13,7 +13,7 @@
 #include "_impl/num_traits/adopt_signedness.h"
 #include "elastic_integer.h"
 #include "fixed_point.h"
-#include "limits.h"  // NOLINT(modernize-deprecated-headers,  hicpp-deprecated-headers)
+#include "numeric_limits.h"
 
 #include <type_traits>
 
diff --git a/include/cnl/elastic_integer.h b/include/cnl/elastic_integer.h
@@ -17,8 +17,8 @@
 #include "_impl/elastic_integer/from_value.h"
 #include "_impl/elastic_integer/generic.h"
 #include "_impl/elastic_integer/is_number.h"
-#include "_impl/elastic_integer/limits.h"
 #include "_impl/elastic_integer/make_elastic_integer.h"
+#include "_impl/elastic_integer/numeric_limits.h"
 #include "_impl/elastic_integer/operators.h"
 #include "_impl/elastic_integer/rep.h"
 #include "_impl/elastic_integer/scale.h"
diff --git a/include/cnl/elastic_scaled_integer.h b/include/cnl/elastic_scaled_integer.h
@@ -12,7 +12,7 @@
 
 #include "_impl/num_traits/adopt_signedness.h"
 #include "elastic_integer.h"
-#include "limits.h"  // NOLINT(modernize-deprecated-headers,  hicpp-deprecated-headers)
+#include "numeric_limits.h"
 #include "scaled_integer.h"
 
 #include <type_traits>
diff --git a/include/cnl/numeric_limits.h b/include/cnl/numeric_limits.h
diff --git a/test/unit/_impl/wide_integer/definition.cpp b/test/unit/_impl/wide_integer/definition.cpp
@@ -12,7 +12,7 @@
 #include <cnl/_impl/type_traits/assert_same.h>
 #include <cnl/_impl/type_traits/identical.h>
 #include <cnl/cstdint.h>
-#include <cnl/limits.h>
+#include <cnl/numeric_limits.h>
 #include <cnl/wide_integer.h>
 
 #include <gtest/gtest.h>
diff --git a/test/unit/limits.cpp b/test/unit/limits.cpp
@@ -8,8 +8,9 @@
 /// \brief tests for cnl/limits.h
 
 #include <cnl/cstdint.h>
-#include <cnl/limits.h>
+#include <cnl/numeric_limits.h>
 
+#include <climits>
 #include <type_traits>
 
 namespace {
diff --git a/test/unit/number_test.h b/test/unit/number_test.h
@@ -7,7 +7,7 @@
 #if !defined(TEST_NUMBER_TEST_H)
 #define TEST_NUMBER_TEST_H
 
-#include <cnl/limits.h>
+#include <cnl/numeric_limits.h>
 #include <cnl/num_traits.h>
 #include <cnl/numeric.h>
 
diff --git a/test/unit/papers/p0381.cpp b/test/unit/papers/p0381.cpp
@@ -12,6 +12,8 @@
 #include <boost/integer.hpp>
 #endif
 
+#include <climits>
+
 using std::is_same;
 
 namespace sample1 {
diff --git a/test/unit/scaled_integer/fraction_ctor.h b/test/unit/scaled_integer/fraction_ctor.h
@@ -16,6 +16,8 @@
 #include <cnl/fraction.h>
 #include <cnl/scaled_integer.h>
 
+#include <climits>
+
 namespace {  // NOLINT(cert-dcl59-cpp)
     using cnl::_impl::identical;
 
diff --git a/test/unit/scaled_integer/numbers.cpp b/test/unit/scaled_integer/numbers.cpp
@@ -4,7 +4,7 @@
 //  (See accompanying file ../../LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-#include <cnl/_impl/assert.h>
+#include <cnl/_impl/cnl_assert.h>
 #include <cnl/_impl/type_traits/identical.h>
 #include <cnl/scaled_integer.h>
 
diff --git a/test/unit/scaled_integer/scaled_integer_common.h b/test/unit/scaled_integer/scaled_integer_common.h
@@ -22,6 +22,8 @@
 #include "to_chars.h"
 #include "to_string.h"
 
+#include <climits>
+
 ////////////////////////////////////////////////////////////////////////////////
 // copy assignment
 
