From: Paolo Carlini <pcarlini@suse.de>
Date: Tue, 24 Feb 2004 21:20:33 +0000 (+0000)
Subject: re PR libstdc++/14252 (Problems with count and iterator_traits<istreambuf_iterator... 
X-Git-Tag: releases/gcc-4.0.0~9876
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b79cef06831df186cbc34802210ec3f8c71c65e8;p=thirdparty%2Fgcc.git

re PR libstdc++/14252 (Problems with count and iterator_traits<istreambuf_iterator<char> >::difference_type)

2004-02-24  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/14252
	* include/bits/postypes.h (class streamoff): Add operator++(),
	operator++(int), operator--() and operator--(int).
	* testsuite/27_io/fpos/14252.cc: New.

From-SVN: r78388
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2b87092a3be3..7751810a5c63 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-24  Paolo Carlini  <pcarlini@suse.de>
+
+	PR libstdc++/14252
+	* include/bits/postypes.h (class streamoff): Add operator++(),
+	operator++(int), operator--() and operator--(int).
+	* testsuite/27_io/fpos/14252.cc: New.
+
 2004-02-24  Richard Sandiford  <rsandifo@redhat.com>
 
 	* include/bits/locale_facets.tcc (num_get::_M_extract_int): Fix bounds
diff --git a/libstdc++-v3/include/bits/postypes.h b/libstdc++-v3/include/bits/postypes.h
index 5db3d7b1d596..b82b36e817fb 100644
--- a/libstdc++-v3/include/bits/postypes.h
+++ b/libstdc++-v3/include/bits/postypes.h
@@ -126,6 +126,36 @@ namespace std
       _M_off -= __off;
       return *this;
     }
+
+    streamoff&
+    operator++()
+    {
+      ++_M_off;
+      return *this;
+    }
+
+    streamoff
+    operator++(int)
+    {
+      const streamoff __tmp(*this);
+      ++_M_off;
+      return __tmp;
+    }
+
+    streamoff&
+    operator--()
+    {
+      --_M_off;
+      return *this;
+    }
+
+    streamoff
+    operator--(int)
+    {
+      const streamoff __tmp(*this);
+      --_M_off;
+      return __tmp;
+    }
   };
 
   /**
diff --git a/libstdc++-v3/testsuite/27_io/fpos/14252.cc b/libstdc++-v3/testsuite/27_io/fpos/14252.cc
new file mode 100644
index 000000000000..bc201a213f04
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/fpos/14252.cc
@@ -0,0 +1,62 @@
+// 2004-02-24  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2004 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// 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>
+#include <testsuite_hooks.h>
+
+// libstdc++/14252
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  std::streamoff off01 = 10;
+  std::streamoff off02 = 2;
+  std::streamoff off03 = 2004;
+  std::streamoff off04 = 1;
+
+  VERIFY( off01++ == 10 );
+  VERIFY( off01 == 11 );
+  
+  VERIFY( ++off02 == 3 );
+  VERIFY( off02 == 3 );
+
+  VERIFY( off03-- == 2004 );
+  VERIFY( off03 == 2003 );
+
+  VERIFY( --off04 == 0 );
+  VERIFY( off04 == 0 );
+} 
+
+int main() 
+{
+  test01();
+  return 0;
+}