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

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