gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Googletest export

Browse Source 
Merge b8ca465e73ac0954a0c9eec2a84bdd8913d5763b into 90a443f9c2

Closes #2396

COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2396 from kuzkry:custom-type-traits-true/false_type-and-bool_constant b8ca465e73ac0954a0c9eec2a84bdd8913d5763b
PiperOrigin-RevId: 265064856
This commit is contained in:
kuzkry
2019-08-23 11:57:56 -04:00
committed by Xiaoyi Zhang
parent 46525e1e5d
commit db1b739943
5 changed files with 29 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
googletest/include/gtest/internal/gtest-internal.h
View File

@@ -946,7 +946,7 @@ template <typename C,
struct IsRecursiveContainerImpl;
template <typename C>
struct IsRecursiveContainerImpl<C, false> : public false_type {};
struct IsRecursiveContainerImpl<C, false> : public std::false_type {};
// Since the IsRecursiveContainerImpl depends on the IsContainerTest we need to
// obey the same inconsistencies as the IsContainerTest, namely check if

11
googletest/include/gtest/internal/gtest-port.h
View File

@@ -1898,15 +1898,8 @@ class GTEST_API_ ThreadLocal {
// we cannot detect it.
GTEST_API_ size_t GetThreadCount();
template <bool bool_value>
struct bool_constant {
typedef bool_constant<bool_value> type;
static const bool value = bool_value;
};
template <bool bool_value> const bool bool_constant<bool_value>::value;
typedef bool_constant<false> false_type;
typedef bool_constant<true> true_type;
template <bool B>
using bool_constant = std::integral_constant<bool, B>;
template <typename Iterator>
struct IteratorTraits {