Changes imported from Abseil "staging" branch:

- e4999febdfea4d392284bfbc9dce9520b26d98cb Remove an erronous __attribute__((...)) tag. by Abseil Team <absl-team@google.com>
  - 61db01b3eaad3563aa2f97d41799ef1339d57c04 Remove the default parameter value from overridden overfl... by Abseil Team <absl-team@google.com>
  - e7dc1ee6bb523b2173915e1978f7e3831f5484f6 Fix the include guards for exception_safety_testing.h by Jon Cohen <cohenjon@google.com>

GitOrigin-RevId: e4999febdfea4d392284bfbc9dce9520b26d98cb
Change-Id: I7837e125138a1e623d9b6394c0ea5f624b904ea2
This commit is contained in:
Abseil Team 2017-10-31 13:08:08 -07:00 committed by misterg
parent 8db6cfd1ea
commit c56e7827d6
3 changed files with 5 additions and 5 deletions

View file

@ -75,7 +75,7 @@ class OStringStream : private std::basic_streambuf<char>, public std::ostream {
private:
using Buf = std::basic_streambuf<char>;
Buf::int_type overflow(int c = Buf::traits_type::eof()) override {
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));