Fix even more Clang warnings.
This patch disables shift-sign-overflow warnings for now. It also
fixes most -Wfloat-equal warnings and -Wextra-semi warnings.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@343438 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7295e01..3ea86ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -547,7 +547,7 @@
add_compile_flags_if_supported(
-Wall -Wextra -W -Wwrite-strings
-Wno-unused-parameter -Wno-long-long
- -Werror=return-type)
+ -Werror=return-type -Wextra-semi)
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
add_compile_flags_if_supported(
-Wno-user-defined-literals
@@ -566,6 +566,7 @@
-Wno-sign-conversion
-Wno-old-style-cast
-Wno-deprecated # FIXME: Remove this and fix all occurrences.
+ -Wno-shift-sign-overflow # FIXME: Why do we need this with clang-cl but not clang?
)
endif()
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
diff --git a/include/filesystem b/include/filesystem
index 7547e6c..339bb25 100644
--- a/include/filesystem
+++ b/include/filesystem
@@ -587,7 +587,7 @@
typename enable_if<__can_convert_char<_ECharT>::value, bool>::type
__is_separator(_ECharT __e) {
return __e == _ECharT('/');
-};
+}
struct _NullSentinal {};
diff --git a/include/memory b/include/memory
index df629b9..6e292a5 100644
--- a/include/memory
+++ b/include/memory
@@ -2131,7 +2131,9 @@
_LIBCPP_INLINE_VISIBILITY
constexpr explicit
__compressed_pair_elem(_Up&& __u)
- : __value_(_VSTD::forward<_Up>(__u)){};
+ : __value_(_VSTD::forward<_Up>(__u))
+ {
+ }
template <class... _Args, size_t... _Indexes>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
@@ -2168,7 +2170,8 @@
_LIBCPP_INLINE_VISIBILITY
constexpr explicit
__compressed_pair_elem(_Up&& __u)
- : __value_type(_VSTD::forward<_Up>(__u)){};
+ : __value_type(_VSTD::forward<_Up>(__u))
+ {}
template <class... _Args, size_t... _Indexes>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
diff --git a/include/regex b/include/regex
index db15f78..1858500 100644
--- a/include/regex
+++ b/include/regex
@@ -1352,9 +1352,9 @@
virtual ~__node() {}
_LIBCPP_INLINE_VISIBILITY
- virtual void __exec(__state&) const {};
+ virtual void __exec(__state&) const {}
_LIBCPP_INLINE_VISIBILITY
- virtual void __exec_split(bool, __state&) const {};
+ virtual void __exec_split(bool, __state&) const {}
};
// __end_state
diff --git a/include/utility b/include/utility
index 570ec05..5388585 100644
--- a/include/utility
+++ b/include/utility
@@ -1454,7 +1454,7 @@
size_t operator()(float __v) const _NOEXCEPT
{
// -0.0 and 0.0 should return same hash
- if (__v == 0)
+ if (__v == 0.0)
return 0;
return __scalar_hash<float>::operator()(__v);
}
@@ -1468,7 +1468,7 @@
size_t operator()(double __v) const _NOEXCEPT
{
// -0.0 and 0.0 should return same hash
- if (__v == 0)
+ if (__v == 0.0)
return 0;
return __scalar_hash<double>::operator()(__v);
}
@@ -1482,7 +1482,7 @@
size_t operator()(long double __v) const _NOEXCEPT
{
// -0.0 and 0.0 should return same hash
- if (__v == 0)
+ if (__v == 0.0)
return 0;
#if defined(__i386__)
// Zero out padding bits
diff --git a/include/vector b/include/vector
index e7aaa4d..de7de09 100644
--- a/include/vector
+++ b/include/vector
@@ -2455,7 +2455,7 @@
void __vdeallocate() _NOEXCEPT;
_LIBCPP_INLINE_VISIBILITY
static size_type __align_it(size_type __new_size) _NOEXCEPT
- {return __new_size + (__bits_per_word-1) & ~((size_type)__bits_per_word-1);};
+ {return __new_size + (__bits_per_word-1) & ~((size_type)__bits_per_word-1);}
_LIBCPP_INLINE_VISIBILITY size_type __recommend(size_type __new_size) const;
_LIBCPP_INLINE_VISIBILITY void __construct_at_end(size_type __n, bool __x);
template <class _ForwardIterator>