diff --git a/client/simple_string_dictionary_test.cc b/client/simple_string_dictionary_test.cc index f1e34013..4619be74 100644 --- a/client/simple_string_dictionary_test.cc +++ b/client/simple_string_dictionary_test.cc @@ -276,7 +276,7 @@ TEST(SimpleStringDictionary, OutOfSpace) { EXPECT_FALSE(map.GetValueForKey("c")); } -#if DCHECK_IS_ON +#if DCHECK_IS_ON() TEST(SimpleStringDictionaryDeathTest, NullKey) { TSimpleStringDictionary<4, 6, 6> map; diff --git a/util/misc/initialization_state_dcheck.cc b/util/misc/initialization_state_dcheck.cc index ac584dc6..82bb5b6d 100644 --- a/util/misc/initialization_state_dcheck.cc +++ b/util/misc/initialization_state_dcheck.cc @@ -16,7 +16,7 @@ namespace crashpad { -#if DCHECK_IS_ON +#if DCHECK_IS_ON() InitializationStateDcheck::State InitializationStateDcheck::SetInitializing() { State old_state = state(); diff --git a/util/misc/initialization_state_dcheck.h b/util/misc/initialization_state_dcheck.h index 790a3d8c..24b3d077 100644 --- a/util/misc/initialization_state_dcheck.h +++ b/util/misc/initialization_state_dcheck.h @@ -25,7 +25,7 @@ namespace crashpad { -#if DCHECK_IS_ON || DOXYGEN +#if DCHECK_IS_ON() || DOXYGEN //! \brief Tracks whether data are initialized, triggering a DCHECK assertion //! on an invalid data access. @@ -168,7 +168,7 @@ struct InitializationStateDcheck { // technically invalid according to the standard, but clang and g++ accept them // without complaint even with warnings turned up. They take up no space at all, // and they can be “initialized” with the same () syntax used to initialize -// objects of the DCHECK_IS_ON InitializationStateDcheck class above. +// objects of the DCHECK_IS_ON() InitializationStateDcheck class above. using InitializationStateDcheck = bool[0]; #endif // COMPILER_MSVC diff --git a/util/misc/initialization_state_dcheck_test.cc b/util/misc/initialization_state_dcheck_test.cc index 7c68255e..b293ab72 100644 --- a/util/misc/initialization_state_dcheck_test.cc +++ b/util/misc/initialization_state_dcheck_test.cc @@ -29,7 +29,7 @@ TEST(InitializationStateDcheck, InitializationStateDcheck) { INITIALIZATION_STATE_DCHECK_VALID(initialization_state_dcheck); } -#if DCHECK_IS_ON +#if DCHECK_IS_ON() // InitializationStateDcheck only DCHECKs, so the death tests can only run // when DCHECKs are enabled.