000-12-22 Benjamin Kosnik <bkoz@fillmore.redhat.com>

	Attempt to make locale visible in gdb.
	* include/bits/std_locale.h: Remove codecvt.h include.
	* include/bits/locale_facets.h: Add here, after ctype decls.
	* include/bits/codecvt.h: Remove std namespace, as assumed to be
	in std now.

	* include/bits/locale_facets.h: Consistently move generic static
	member definitions directly after generic facet declarations.
	* include/bits/locale_facets.tcc: From here.

	* src/locale.cc: Organize locale::id static definitions for
	required facets.
	* src/codecvt.cc (codecvt<char...>): Remove locale::id definition.
	(codecvt<wchar_t...>): Same.
	* src/localename: And here.

	* include/bits/localefwd.h (_Count_ones): Change _S_count to _M_count.
	Same for _M_halfcount.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38450 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2e63a93..d393cf7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -18,7 +18,6 @@
        
        * include/bits/localefwd.h (_Count_ones): Change _S_count to _M_count.
        Same for _M_halfcount.
-       (std): make locale::_Impl protected. CHANGE BACK
 
 2000-12-22  Alexandre Oliva  <aoliva@redhat.com>
 

diff --git a/libstdc++-v3/include/bits/localefwd.h b/libstdc++-v3/include/bits/localefwd.h
index fdbc1ce..77731c5 100644 (file)
--- a/libstdc++-v3/include/bits/localefwd.h
+++ b/libstdc++-v3/include/bits/localefwd.h
@@ -329,8 +329,7 @@ namespace std
       friend bool  
       has_facet(const locale&) throw();
 
-    //  private:
-  protected:
+  private:
     // Data Members.
     size_t                             _M_references;
     __vec_facet*                       _M_facets;