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

Adds GTEST_REMOVE_REFERENCE_AND_CONST_.

Browse Source
This commit is contained in:
zhanyong.wan
2010-05-17 19:31:00 +00:00
parent 65f2fd5920
commit 55d166a222
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/gtest/internal/gtest-internal.h
View File

@@ -842,6 +842,10 @@ struct RemoveConst<T[N]> {
#define GTEST_REMOVE_CONST_(T) \ #define GTEST_REMOVE_CONST_(T) \
typename ::testing::internal::RemoveConst<T>::type typename ::testing::internal::RemoveConst<T>::type
// Turns const U&, U&, const U, and U all into U.
#define GTEST_REMOVE_REFERENCE_AND_CONST_(T) \
GTEST_REMOVE_CONST_(GTEST_REMOVE_REFERENCE_(T))
// Adds reference to a type if it is not a reference type, // Adds reference to a type if it is not a reference type,
// otherwise leaves it unchanged. This is the same as // otherwise leaves it unchanged. This is the same as
// tr1::add_reference, which is not widely available yet. // tr1::add_reference, which is not widely available yet.
@@ -1046,7 +1050,7 @@ class NativeArray {
// Ensures that the user doesn't instantiate NativeArray with a // Ensures that the user doesn't instantiate NativeArray with a
// const or reference type. // const or reference type.
static_cast<void>(StaticAssertTypeEqHelper<Element, static_cast<void>(StaticAssertTypeEqHelper<Element,
GTEST_REMOVE_CONST_(GTEST_REMOVE_REFERENCE_(Element))>()); GTEST_REMOVE_REFERENCE_AND_CONST_(Element)>());
if (relation_to_source_ == kCopy) if (relation_to_source_ == kCopy)
delete[] array_; delete[] array_;
} }

15
test/gtest_unittest.cc
View File

@@ -6834,6 +6834,21 @@ TEST(RemoveConstTest, MacroVersion) {
TestGTestRemoveConst<char, const char>(); TestGTestRemoveConst<char, const char>();
} }
// Tests GTEST_REMOVE_REFERENCE_AND_CONST_.
template <typename T1, typename T2>
void TestGTestRemoveReferenceAndConst() {
CompileAssertTypesEqual<T1, GTEST_REMOVE_REFERENCE_AND_CONST_(T2)>();
}
TEST(RemoveReferenceToConstTest, Works) {
TestGTestRemoveReferenceAndConst<int, int>();
TestGTestRemoveReferenceAndConst<double, double&>();
TestGTestRemoveReferenceAndConst<char, const char>();
TestGTestRemoveReferenceAndConst<char, const char&>();
TestGTestRemoveReferenceAndConst<const char*, const char*>();
}
// Tests that AddReference does not affect reference types. // Tests that AddReference does not affect reference types.
TEST(AddReferenceTest, DoesNotAffectReferenceType) { TEST(AddReferenceTest, DoesNotAffectReferenceType) {
CompileAssertTypesEqual<int&, AddReference<int&>::type>(); CompileAssertTypesEqual<int&, AddReference<int&>::type>();