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

postypes.h (operator==(const fpos<>&, const fpos<>&), [...]): Add. 

2006-06-21  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/postypes.h (operator==(const fpos<>&, const fpos<>&),
	operator!=(const fpos<>&, const fpos<>&)): Add.
	* testsuite/27_io/fpos/mbstate_t/6.cc: New.

From-SVN: r114871
This commit is contained in:
Paolo Carlini 2006-06-21 22:21:45 +00:00 committed by Paolo Carlini
parent 35fa89150a
commit e0480f3fdc
3 changed files with 71 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2006-06-21 Paolo Carlini <pcarlini@suse.de>
* include/bits/postypes.h (operator==(const fpos<>&, const fpos<>&),
operator!=(const fpos<>&, const fpos<>&)): Add.
* testsuite/27_io/fpos/mbstate_t/6.cc: New.
2006-06-21 Mark Mitchell <mark@codesourcery.com>
* acinclude.m4 (GLIBCXX_EXPORT_INSTALL_INFO): When

20
libstdc++-v3/include/bits/postypes.h
View File

@ -119,11 +119,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
/// Convert to streamoff.
operator streamoff() const { return _M_off; }
// NB: Via conversion to streamoff, two fpos objects can be compared.
// The standard only requires that operator== must be an equivalence
// relation. In this implementation two fpos objects belong to the
// same equivalence class if the contained offsets compare equal.
/// Remember the value of @a st.
void
state(_StateT __st)
@ -194,6 +189,21 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
{ return _M_off - __other._M_off; }
};
// The standard only requires that operator== must be an
// equivalence relation. In this implementation two fpos<StateT>
// objects belong to the same equivalence class if the contained
// offsets compare equal.
/// Test if equivalent to another position.
template<typename _StateT>
inline bool
operator==(const fpos<_StateT>& __lhs, const fpos<_StateT>& __rhs)
{ return streamoff(__lhs) == streamoff(__rhs); }
template<typename _StateT>
inline bool
operator!=(const fpos<_StateT>& __lhs, const fpos<_StateT>& __rhs)
{ return streamoff(__lhs) != streamoff(__rhs); }
// Clauses 21.1.3.1 and 21.1.3.2 describe streampos and wstreampos
// as implementation defined types, but clause 27.2 requires that
// they must both be typedefs for fpos<mbstate_t>

50
libstdc++-v3/testsuite/27_io/fpos/mbstate_t/6.cc Normal file
View File

@ -0,0 +1,50 @@
// { dg-do compile }
// 2006-06-21 Paolo Carlini <pcarlini@suse.de>
// Copyright (C) 2006 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 2, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING. If not, write to the Free
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// As a special exception, you may use this file as part of a free software
// library without restriction. Specifically, if other files instantiate
// templates or use macros or inline functions from this file, or you compile
// this file and link it with other files to produce an executable, this
// file does not by itself cause the resulting executable to be covered by
// the GNU General Public License. This exception does not however
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
// 27.4.3 template class fpos
#include <ios>
class
octave_int
{
template<class U>
octave_int(U i);
};
bool
operator==(const octave_int& lhs, const octave_int& rhs);
bool
Fsave(void)
{
return std::streampos(0) == std::streampos(0);
}