git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 Upstream-Status: Inappropriate [Backport]
   2 From 6cd1f8146545d6f82269c9a96a05438a06fcdc1a Mon Sep 17 00:00:00 2001
   3 From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
   4 Date: Fri, 15 Apr 2011 16:19:39 +0000
   5 Subject: [PATCH 126/200] 2011-04-15  Paolo Carlini  <paolo.carlini@oracle.com>
   6
   7         * include/std/istream: Fix comments in the light of DR60 + N3168.
   8
   9
  10 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@172501 138bc75d-0d04-0410-961f-82ee72b054a4
  11
  12 index ded4833..fb39392 100644
  13 --- a/libstdc++-v3/include/std/istream
  14 +++ b/libstdc++-v3/include/std/istream
  15 @@ -495,8 +495,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
  16         *  If @c rdbuf() is null or if @c sputbackc() fails, sets badbit in
  17         *  the error state.
  18         *
  19 -       *  @note  Since no characters are extracted, the next call to
  20 -       *         @c gcount() will return 0, as required by DR 60.
  21 +       *  @note  This function first clears eofbit.  Since no characters
  22 +       *         are extracted, the next call to @c gcount() will return 0,
  23 +       *         as required by DR 60.
  24        */
  25        __istream_type&
  26        putback(char_type __c);
  27 @@ -510,8 +511,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
  28         *  If @c rdbuf() is null or if @c sungetc() fails, sets badbit in
  29         *  the error state.
  30         *
  31 -       *  @note  Since no characters are extracted, the next call to
  32 -       *         @c gcount() will return 0, as required by DR 60.
  33 +       *  @note  This function first clears eofbit.  Since no characters
  34 +       *         are extracted, the next call to @c gcount() will return 0,
  35 +       *         as required by DR 60.
  36        */
  37        __istream_type&
  38        unget();
  39 @@ -543,9 +545,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
  40         *
  41         *  @note  This function does not count the number of characters
  42         *         extracted, if any, and therefore does not affect the next
  43 -       *         call to @c gcount().
  44 +       *         call to @c gcount().  At variance with putback, unget and
  45 +       *         seekg, eofbit is not cleared first.
  46        */
  47 -      pos_type
  48 +      pos_type
  49        tellg();
  50
  51        /**
  52 @@ -556,11 +559,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
  53         *  If @c fail() is not true, calls @c rdbuf()->pubseekpos(pos).  If
  54         *  that function fails, sets failbit.
  55         *
  56 -       *  @note  This function does not count the number of characters
  57 -       *         extracted, if any, and therefore does not affect the next
  58 -       *         call to @c gcount().
  59 +       *  @note  This function first clears eofbit.  It does not count the
  60 +       *         number of characters extracted, if any, and therefore does
  61 +       *         not affect the next call to @c gcount().
  62        */
  63 -      __istream_type&
  64 +      __istream_type&
  65        seekg(pos_type);
  66
  67        /**
  68 @@ -572,9 +575,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
  69         *  If @c fail() is not true, calls @c rdbuf()->pubseekoff(off,dir).
  70         *  If that function fails, sets failbit.
  71         *
  72 -       *  @note  This function does not count the number of characters
  73 -       *         extracted, if any, and therefore does not affect the next
  74 -       *         call to @c gcount().
  75 +       *  @note  This function first clears eofbit.  It does not count the
  76 +       *         number of characters extracted, if any, and therefore does
  77 +       *         not affect the next call to @c gcount().
  78        */
  79        __istream_type&
  80        seekg(off_type, ios_base::seekdir);
  81 --
  82 1.7.0.4
  83