about summary refs log tree commit diff
path: root/absl
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2017-12-07T15·25-0800
committerAlex Strelnikov <strel@google.com>2017-12-08T15·06-0500
commitecc56367b8836a552b3716c643da99537c128a13 (patch)
tree59fca8d2faf2c48f9d93cd118bad10e221cb281a /absl
parentbff94231504bc7456b4aa99b27e22bf239cff47d (diff)
Changes imported from Abseil "staging" branch:
  - af7f910500f810f04b5e9835a0655ed509ffb60c Correct comment to refer to simple_pair instead of std::p... by Alex Strelnikov <strel@google.com>

GitOrigin-RevId: af7f910500f810f04b5e9835a0655ed509ffb60c
Change-Id: I5829533b8ef07e40f2bb89a6a4b2f9a6128d4f3e
Diffstat (limited to 'absl')
-rw-r--r--absl/meta/type_traits_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/absl/meta/type_traits_test.cc b/absl/meta/type_traits_test.cc
index f0e341f57e35..67d1c4555c4a 100644
--- a/absl/meta/type_traits_test.cc
+++ b/absl/meta/type_traits_test.cc
@@ -258,7 +258,7 @@ TEST(TypeTraitsTest, TestTrivialCopyCtor) {
   // types with vtables
   EXPECT_FALSE(absl::is_trivially_copy_constructible<Base>::value);
 
-  // Verify that std pair of such types is trivially copy constructible
+  // Verify that simple_pair of such types is trivially copy constructible
   EXPECT_TRUE(
       (absl::is_trivially_copy_constructible<simple_pair<int, char*>>::value));
   EXPECT_TRUE((
@@ -270,7 +270,7 @@ TEST(TypeTraitsTest, TestTrivialCopyCtor) {
   typedef int int10[10];
   EXPECT_FALSE(absl::is_trivially_copy_constructible<int10>::value);
 
-  // Verify that pairs of types without trivial copy constructors
+  // Verify that simple_pairs of types without trivial copy constructors
   // are not marked as trivial.
   EXPECT_FALSE((absl::is_trivially_copy_constructible<
                 simple_pair<int, std::string>>::value));