summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2017-11-14 13:17:47 -0800
committerGravatar John Olson <jolson@google.com>2017-11-15 10:43:52 -0500
commit99b92c87365aa3af68f3cc7818efb6126985fe4c (patch)
treecdc789603f247c7cfc2bb3b529c8355eab031964
parent02f833cb81c998264927a5c179325b5f5688de8c (diff)
Changes imported from Abseil "staging" branch:
- 79d5e27b30551028a35084bf0f314d14339f816b Adds "()" suffix for Minutes() and ToDoubleHours() in com... by Abseil Team <absl-team@google.com> - 7d43f4d8f056066bd8e4577e15cde6807f6191ec Change type traits tests to static_asserts; Add trivially... by Alex Strelnikov <strel@google.com> - b443886fd36b240df78683c676b7ebae07c9e91a Internal cleanup by Abseil Team <absl-team@google.com> - ef226810f398f0980e2158bfa352ab8ac5d97d83 Avoid weak virtual table warnings (-Wweak-vtables) and re... by Jorg Brown <jorg@google.com> - 76911667bed455c2c7330f8ee27b959bac032e41 Internal change by Abseil Team <absl-team@google.com> GitOrigin-RevId: 79d5e27b30551028a35084bf0f314d14339f816b Change-Id: I752b04c882ff6677af7ee91b1e4f424417a1e4eb
-rw-r--r--absl/numeric/int128_test.cc15
-rw-r--r--absl/strings/BUILD.bazel1
-rw-r--r--absl/strings/internal/ostringstream.cc34
-rw-r--r--absl/strings/internal/ostringstream.h14
-rw-r--r--absl/time/time.h4
5 files changed, 48 insertions, 20 deletions
diff --git a/absl/numeric/int128_test.cc b/absl/numeric/int128_test.cc
index c8aabeb3..1772d0ef 100644
--- a/absl/numeric/int128_test.cc
+++ b/absl/numeric/int128_test.cc
@@ -93,6 +93,15 @@ TEST(Uint128, IntrinsicTypeTraitsTest) {
}
#endif // ABSL_HAVE_INTRINSIC_INT128
+TEST(Uint128, TrivialTraitsTest) {
+ static_assert(absl::is_trivially_default_constructible<absl::uint128>::value,
+ "");
+ static_assert(absl::is_trivially_copy_constructible<absl::uint128>::value,
+ "");
+ static_assert(absl::is_trivially_copy_assignable<absl::uint128>::value, "");
+ static_assert(std::is_trivially_destructible<absl::uint128>::value, "");
+}
+
TEST(Uint128, AllTests) {
absl::uint128 zero = 0;
absl::uint128 one = 1;
@@ -418,12 +427,6 @@ TEST(Uint128, ConstexprTest) {
EXPECT_EQ(minus_two, absl::MakeUint128(-1, -2));
}
-TEST(Uint128, Traits) {
- EXPECT_TRUE(absl::is_trivially_copy_constructible<absl::uint128>::value);
- EXPECT_TRUE(absl::is_trivially_copy_assignable<absl::uint128>::value);
- EXPECT_TRUE(std::is_trivially_destructible<absl::uint128>::value);
-}
-
TEST(Uint128, OStream) {
struct {
absl::uint128 val;
diff --git a/absl/strings/BUILD.bazel b/absl/strings/BUILD.bazel
index 49f49abd..71d1606b 100644
--- a/absl/strings/BUILD.bazel
+++ b/absl/strings/BUILD.bazel
@@ -82,6 +82,7 @@ cc_library(
cc_library(
name = "internal",
srcs = [
+ "internal/ostringstream.cc",
"internal/utf8.cc",
],
hdrs = [
diff --git a/absl/strings/internal/ostringstream.cc b/absl/strings/internal/ostringstream.cc
new file mode 100644
index 00000000..6ee2b109
--- /dev/null
+++ b/absl/strings/internal/ostringstream.cc
@@ -0,0 +1,34 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "absl/strings/internal/ostringstream.h"
+
+namespace absl {
+namespace strings_internal {
+
+OStringStream::Buf::int_type OStringStream::overflow(int c) {
+ assert(s_);
+ if (!Buf::traits_type::eq_int_type(c, Buf::traits_type::eof()))
+ s_->push_back(static_cast<char>(c));
+ return 1;
+}
+
+std::streamsize OStringStream::xsputn(const char* s, std::streamsize n) {
+ assert(s_);
+ s_->append(s, n);
+ return n;
+}
+
+} // namespace strings_internal
+} // namespace absl
diff --git a/absl/strings/internal/ostringstream.h b/absl/strings/internal/ostringstream.h
index 01314659..6e1325b9 100644
--- a/absl/strings/internal/ostringstream.h
+++ b/absl/strings/internal/ostringstream.h
@@ -75,18 +75,8 @@ class OStringStream : private std::basic_streambuf<char>, public std::ostream {
private:
using Buf = std::basic_streambuf<char>;
- Buf::int_type overflow(int c) override {
- assert(s_);
- if (!Buf::traits_type::eq_int_type(c, Buf::traits_type::eof()))
- s_->push_back(static_cast<char>(c));
- return 1;
- }
-
- std::streamsize xsputn(const char* s, std::streamsize n) override {
- assert(s_);
- s_->append(s, n);
- return n;
- }
+ Buf::int_type overflow(int c) override;
+ std::streamsize xsputn(const char* s, std::streamsize n) override;
std::string* s_;
};
diff --git a/absl/time/time.h b/absl/time/time.h
index 77366b58..2cbe9437 100644
--- a/absl/time/time.h
+++ b/absl/time/time.h
@@ -291,7 +291,7 @@ Duration Ceil(Duration d, Duration unit);
// Microseconds()
// Milliseconds()
// Seconds()
-// Minutes
+// Minutes()
// Hours()
//
// Factory functions for constructing `Duration` values from an integral number
@@ -374,7 +374,7 @@ int64_t ToInt64Hours(Duration d);
// ToDoubleMilliseconds()
// ToDoubleSeconds()
// ToDoubleMinutes()
-// ToDoubleHours
+// ToDoubleHours()
//
// Helper functions that convert a Duration to a floating point count of the
// indicated unit. These functions are shorthand for the `FDivDuration()`