saberbud/parallel-hashmap
1
0
Fork 0
mirror of https://github.com/greg7mdp/parallel-hashmap.git synced 2026-08-29 16:40:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

enable warning level for for tests (msvc) and cleanup some warnings.

Browse Source
This commit is contained in:
greg
2020-01-01 13:56:35 -05:00
parent e4dc9c59a8
commit 9191e51500
11 changed files with 94 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
Vendored
+1 -1
View File
@@ -116,7 +116,7 @@ if (PHMAP_BUILD_TESTS)
## --------------- btree -----------------------------------------------
phmap_cc_test(NAME btree SRCS "tests/btree_test.cc"
CWOPTS "/W0" CLOPTS "-w" DEPS gmock_main)
CLOPTS "-w" DEPS gmock_main)
endif()
cmake/helpers.cmake
Vendored
+1 -1
View File
@@ -26,7 +26,7 @@ function(phmap_cc_test)
)
if(MSVC)
target_compile_options(${_NAME}
PRIVATE ${PHMAP_CC_TEST_CWOPTS}
PRIVATE ${PHMAP_CC_TEST_CWOPTS} /W4
)
else()
target_compile_options(${_NAME}
parallel_hashmap/btree.h
Vendored
+20 -19
View File
@@ -34,6 +34,26 @@
#ifndef PHMAP_BTREE_BTREE_CONTAINER_H_
#define PHMAP_BTREE_BTREE_CONTAINER_H_
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4127) // conditional expression is constant
#pragma warning(disable : 4324) // structure was padded due to alignment specifier
#pragma warning(disable : 4355) // 'this': used in base member initializer list
#pragma warning(disable : 4365) // conversion from 'int' to 'const unsigned __int64', signed/unsigned mismatch
#pragma warning(disable : 4514) // unreferenced inline function has been removed
#pragma warning(disable : 4623) // default constructor was implicitly defined as deleted
#pragma warning(disable : 4625) // copy constructor was implicitly defined as deleted
#pragma warning(disable : 4626) // assignment operator was implicitly defined as deleted
#pragma warning(disable : 4710) // function not inlined
#pragma warning(disable : 4711) // selected for automatic inline expansion
#pragma warning(disable : 4820) // '6' bytes padding added after data member
#pragma warning(disable : 4868) // compiler may not enforce left-to-right evaluation order in braced initializer list
#pragma warning(disable : 5026) // move constructor was implicitly defined as deleted
#pragma warning(disable : 5027) // move assignment operator was implicitly defined as deleted
#pragma warning(disable : 5045) // Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
#endif
#include <initializer_list>
#include <iterator>
#include <utility>
@@ -67,25 +87,6 @@
#define PHMAP_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION 1
#endif
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4127) // conditional expression is constant
#pragma warning(disable : 4324) // structure was padded due to alignment specifier
#pragma warning(disable : 4355) // 'this': used in base member initializer list
#pragma warning(disable : 4514) // unreferenced inline function has been removed
#pragma warning(disable : 4623) // default constructor was implicitly defined as deleted
#pragma warning(disable : 4625) // copy constructor was implicitly defined as deleted
#pragma warning(disable : 4626) // assignment operator was implicitly defined as deleted
#pragma warning(disable : 4710) // function not inlined
#pragma warning(disable : 4711) // selected for automatic inline expansion
#pragma warning(disable : 4820) // '6' bytes padding added after data member
#pragma warning(disable : 4868) // compiler may not enforce left-to-right evaluation order in braced initializer list
#pragma warning(disable : 5026) // move constructor was implicitly defined as deleted
#pragma warning(disable : 5027) // move assignment operator was implicitly defined as deleted
#pragma warning(disable : 5045) // Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
#endif
namespace phmap {
// Defined and documented later on in this file.
parallel_hashmap/phmap.h
Vendored
+18 -17
View File
@@ -33,6 +33,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// ---------------------------------------------------------------------------
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4127) // conditional expression is constant
#pragma warning(disable : 4324) // structure was padded due to alignment specifier
#pragma warning(disable : 4514) // unreferenced inline function has been removed
#pragma warning(disable : 4623) // default constructor was implicitly defined as deleted
#pragma warning(disable : 4625) // copy constructor was implicitly defined as deleted
#pragma warning(disable : 4626) // assignment operator was implicitly defined as deleted
#pragma warning(disable : 4710) // function not inlined
#pragma warning(disable : 4711) // selected for automatic inline expansion
#pragma warning(disable : 4820) // '6' bytes padding added after data member
#pragma warning(disable : 4868) // compiler may not enforce left-to-right evaluation order in braced initializer list
#pragma warning(disable : 5027) // move assignment operator was implicitly defined as deleted
#pragma warning(disable : 5045) // Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
#endif
#include <algorithm>
#include <cmath>
#include <cstring>
@@ -54,23 +72,6 @@
#include <string_view>
#endif
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4127) // conditional expression is constant
#pragma warning(disable : 4324) // structure was padded due to alignment specifier
#pragma warning(disable : 4514) // unreferenced inline function has been removed
#pragma warning(disable : 4623) // default constructor was implicitly defined as deleted
#pragma warning(disable : 4625) // copy constructor was implicitly defined as deleted
#pragma warning(disable : 4626) // assignment operator was implicitly defined as deleted
#pragma warning(disable : 4710) // function not inlined
#pragma warning(disable : 4711) // selected for automatic inline expansion
#pragma warning(disable : 4820) // '6' bytes padding added after data member
#pragma warning(disable : 4868) // compiler may not enforce left-to-right evaluation order in braced initializer list
#pragma warning(disable : 5027) // move assignment operator was implicitly defined as deleted
#pragma warning(disable : 5045) // Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
#endif
namespace phmap {
namespace container_internal {
parallel_hashmap/phmap_fwd_decl.h
Vendored
+11
View File
@@ -11,6 +11,13 @@
// https://www.apache.org/licenses/LICENSE-2.0
// ---------------------------------------------------------------------------
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4514) // unreferenced inline function has been removed
#pragma warning(disable : 4710) // function not inlined
#pragma warning(disable : 4711) // selected for automatic inline expansion
#endif
#include <memory>
#include <utility>
#include <functional>
@@ -140,4 +147,8 @@ namespace phmap {
} // namespace phmap
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#endif // phmap_fwd_decl_h_guard_
parallel_hashmap/phmap_utils.h
Vendored
+7 -5
View File
@@ -21,16 +21,18 @@
// limitations under the License.
// ---------------------------------------------------------------------------
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4514) // unreferenced inline function has been removed
#pragma warning(disable : 4710) // function not inlined
#pragma warning(disable : 4711) // selected for automatic inline expansion
#endif
#include <cstdint>
#include <functional>
#include <tuple>
#include "phmap_bits.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4514) // unreferenced inline function has been removed
#endif
namespace phmap
{
tests/flat_hash_map_test.cc
+9
View File
@@ -27,12 +27,21 @@
#include <any>
#endif
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4710 4711)
#endif
#include "hash_generator_testing.h"
#include "unordered_map_constructor_test.h"
#include "unordered_map_lookup_test.h"
#include "unordered_map_members_test.h"
#include "unordered_map_modifiers_test.h"
#ifdef _MSC_VER
#pragma warning(pop)
#endif
namespace phmap {
namespace container_internal {
namespace {
tests/node_hash_policy_test.cc
+2 -2
View File
@@ -29,12 +29,12 @@ struct Policy : node_hash_policy<int&, Policy> {
using init_type = int;
template <class Alloc>
static int* new_element(Alloc* alloc, int value) {
static int* new_element(Alloc*, int value) {
return new int(value);
}
template <class Alloc>
static void delete_element(Alloc* alloc, int* elem) {
static void delete_element(Alloc* , int* elem) {
delete elem;
}
};
tests/unordered_map_constructor_test.h
Vendored
+8
View File
@@ -19,11 +19,19 @@
#include <vector>
#include <unordered_map>
#ifdef _MSC_VER
#pragma warning(push, 0)
#endif
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "hash_generator_testing.h"
#include "hash_policy_testing.h"
#ifdef _MSC_VER
#pragma warning(pop)
#endif
namespace phmap {
namespace container_internal {
tests/unordered_map_lookup_test.h
Vendored
+8
View File
@@ -15,11 +15,19 @@
#ifndef PHMAP_CONTAINER_INTERNAL_UNORDERED_MAP_LOOKUP_TEST_H_
#define PHMAP_CONTAINER_INTERNAL_UNORDERED_MAP_LOOKUP_TEST_H_
#ifdef _MSC_VER
#pragma warning(push, 0)
#endif
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "hash_generator_testing.h"
#include "hash_policy_testing.h"
#ifdef _MSC_VER
#pragma warning(pop)
#endif
namespace phmap {
namespace container_internal {
tests/unordered_map_members_test.h
Vendored
+9
View File
@@ -16,11 +16,20 @@
#define PHMAP_CONTAINER_INTERNAL_UNORDERED_MAP_MEMBERS_TEST_H_
#include <type_traits>
#ifdef _MSC_VER
#pragma warning(push, 0)
#endif
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "hash_generator_testing.h"
#include "hash_policy_testing.h"
#ifdef _MSC_VER
#pragma warning(pop)
#endif
namespace phmap {
namespace container_internal {