diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-12-10 09:48:50 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-12-10 09:48:50 +0000 |
| commit | cf46b011c9366ff360e8304c76dc010c02f8c54b (patch) | |
| tree | ce7a9145d25fdd726e166b8f367447a4000009bc | |
| parent | f2ea04f516b8a6f56662206aa34315fbb5dfab07 (diff) | |
| download | ppe42-gcc-cf46b011c9366ff360e8304c76dc010c02f8c54b.tar.gz ppe42-gcc-cf46b011c9366ff360e8304c76dc010c02f8c54b.zip | |
2013-12-10 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/20_util/is_base_of/value.cc: Add test.
* include/std/fstream: Tiny formatting tweak.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205851 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/fstream | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/is_base_of/value.cc | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a9f6075897b..11132fe7319 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2013-12-10 Paolo Carlini <paolo.carlini@oracle.com> + + * testsuite/20_util/is_base_of/value.cc: Add test. + + * include/std/fstream: Tiny formatting tweak. + 2013-12-09 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/59427 diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream index ce27eb61a08..4bebdb1cc7b 100644 --- a/libstdc++-v3/include/std/fstream +++ b/libstdc++-v3/include/std/fstream @@ -396,8 +396,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION void _M_set_buffer(streamsize __off) { - const bool __testin = _M_mode & ios_base::in; - const bool __testout = (_M_mode & ios_base::out + const bool __testin = _M_mode & ios_base::in; + const bool __testout = (_M_mode & ios_base::out || _M_mode & ios_base::app); if (__testin && __off > 0) diff --git a/libstdc++-v3/testsuite/20_util/is_base_of/value.cc b/libstdc++-v3/testsuite/20_util/is_base_of/value.cc index cacee4c5dee..7a8840301e5 100644 --- a/libstdc++-v3/testsuite/20_util/is_base_of/value.cc +++ b/libstdc++-v3/testsuite/20_util/is_base_of/value.cc @@ -47,6 +47,8 @@ void test01() using namespace __gnu_test; // Positive tests. + static_assert(test_relationship<is_base_of, volatile ClassType, + ClassType>(true), ""); static_assert(test_relationship<is_base_of, AbstractClass, AbstractClass>(true), ""); static_assert(test_relationship<is_base_of, ClassType, |
