enc_filebuf.h: Move concept-check macro to class scope.

2004-08-25  Jonathan Wakely  <redi@gcc.gnu.org>

	* include/ext/enc_filebuf.h: Move concept-check macro to class scope.

From-SVN: r86579

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3c6abcc7c282a47f328bcc7dd17ef5cfa7cb1438..8ca114642c7ab218588f96271b79324973f0f2e7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-25  Jonathan Wakely  <redi@gcc.gnu.org>
+
+       * include/ext/enc_filebuf.h: Move concept-check macro to class scope.
+
 2004-07-27  Benjamin Kosnik  <bkoz@redhat.com>
 
        * config/linker-map.gnu: Export typeinfo information.

diff --git a/libstdc++-v3/include/ext/enc_filebuf.h b/libstdc++-v3/include/ext/enc_filebuf.h
index e1152bd26f9f49de75212deae3db0d1cef2ab66d..4b1a7dfebe916c4e7203e2ae2776f813b8f21a58 100644 (file)
--- a/libstdc++-v3/include/ext/enc_filebuf.h
+++ b/libstdc++-v3/include/ext/enc_filebuf.h
@@ -49,13 +49,16 @@ namespace __gnu_cxx
       
       enc_filebuf(state_type& __state)
       : std::basic_filebuf<_CharT, enc_char_traits<_CharT> >()
-      { 
-       // Set state type to something useful.
-       // Something more than copyconstructible is needed here, so
-       // require copyconstructible + assignment operator.
-       __glibcpp_class_requires(state_type, _SGIAssignableConcept);
-       _M_state_cur = __state;
-       _M_state_cur._M_init();
-      };
+      {
+       this->_M_state_beg = __state;
+       this->_M_state_beg._M_init();
+      }
+
+    private:
+      // concept requirements:
+      // Set state type to something useful.
+      // Something more than copyconstructible is needed here, so
+      // require default and copy constructible + assignment operator.
+      __glibcxx_class_requires(state_type, _SGIAssignableConcept)
     };
 } // namespace __gnu_cxx