OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sstream: Adjust braces. 

2008-05-14  Benjamin Kosnik  <bkoz@redhat.com>

	* include/std/sstream: Adjust braces.
	* include/bits/fstream.tcc: Same.
	* testsuite/29_atomics/atomic_flag/test_and_set/explicit.c: Add
	-shared-libgcc.
	* testsuite/29_atomics/atomic_flag/test_and_set/implicit.c: Same.

	* doc/doxygen/user.cfg.in: Remove thread include.

From-SVN: r135291
This commit is contained in:
Benjamin Kosnik 2008-05-14 13:12:02 +00:00 committed by Benjamin Kosnik
parent 2b8775f335
commit d9cdfe6a7f
6 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,13 @@
2008-05-14 Benjamin Kosnik <bkoz@redhat.com>
* include/std/sstream: Adjust braces.
* include/bits/fstream.tcc: Same.
* testsuite/29_atomics/atomic_flag/test_and_set/explicit.c: Add
-shared-libgcc.
* testsuite/29_atomics/atomic_flag/test_and_set/implicit.c: Same.
* doc/doxygen/user.cfg.in: Remove thread include.
2008-05-13 David Daney <ddaney@avtrex.com>
* config/cpu/mips/atomicity.h: Remove file.

1
libstdc++-v3/doc/doxygen/user.cfg.in
View File

@ -497,7 +497,6 @@ INPUT = @srcdir@/libsupc++/cxxabi.h \
include/streambuf \
include/string \
include/system_error \
include/thread \
include/tuple \
include/type_traits \
include/unordered_map \

32
libstdc++-v3/include/bits/fstream.tcc
View File

@ -662,21 +662,23 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
setbuf(char_type* __s, streamsize __n)
{
if (!this->is_open())
if (__s == 0 && __n == 0)
_M_buf_size = 1;
else if (__s && __n > 0)
{
// This is implementation-defined behavior, and assumes that
// an external char_type array of length __n exists and has
// been pre-allocated. If this is not the case, things will
// quickly blow up. When __n > 1, __n - 1 positions will be
// used for the get area, __n - 1 for the put area and 1
// position to host the overflow char of a full put area.
// When __n == 1, 1 position will be used for the get area
// and 0 for the put area, as in the unbuffered case above.
_M_buf = __s;
_M_buf_size = __n;
}
{
if (__s == 0 && __n == 0)
_M_buf_size = 1;
else if (__s && __n > 0)
{
// This is implementation-defined behavior, and assumes that
// an external char_type array of length __n exists and has
// been pre-allocated. If this is not the case, things will
// quickly blow up. When __n > 1, __n - 1 positions will be
// used for the get area, __n - 1 for the put area and 1
// position to host the overflow char of a full put area.
// When __n == 1, 1 position will be used for the get area
// and 0 for the put area, as in the unbuffered case above.
_M_buf = __s;
_M_buf_size = __n;
}
}
return this;
}

10
libstdc++-v3/include/std/sstream
View File

@ -236,10 +236,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
{
const bool __testin = _M_mode & ios_base::in;
if (this->pptr() && this->pptr() > this->egptr())
if (__testin)
this->setg(this->eback(), this->gptr(), this->pptr());
else
this->setg(this->pptr(), this->pptr(), this->pptr());
{
if (__testin)
this->setg(this->eback(), this->gptr(), this->pptr());
else
this->setg(this->pptr(), this->pptr(), this->pptr());
}
}
};

2
libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit.c
View File

@ -1,4 +1,4 @@
// { dg-options "-x c -lstdc++" }
// { dg-options "-x c -shared-libgcc -lstdc++" }
// Copyright (C) 2008 Free Software Foundation, Inc.
//

2
libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/implicit.c
View File

@ -1,4 +1,4 @@
// { dg-options "-x c -lstdc++" }
// { dg-options "-x c -shared-libgcc -lstdc++" }
// Copyright (C) 2008 Free Software Foundation, Inc.
//