git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

locale_facets.tcc: Remove `static' keyword on function definitions. 

* include/bits/locale_facets.tcc: Remove `static' keyword on
	function definitions.
	* include/bits/std_streambuf.h: Likewise.
	* src/Makefile.am: Remove use of -fimplicit-templates.
	* src/Makefile.in: Regenerated.
	* src/locale-inst.cc: Explicitly instantiate more functions.
	* src/msic-inst.cc: Likewise.
	* src/string-inst.cc: Likewise.

From-SVN: r39481
This commit is contained in:
Mark Mitchell 2001-02-06 06:36:18 +00:00 committed by Mark Mitchell
parent 3e897b66f7
commit bf6adbe2c6
8 changed files with 130 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,14 @@
2001-02-05 Mark Mitchell <mark@codesourcery.com>
* include/bits/locale_facets.tcc: Remove `static' keyword on
function definitions.
* include/bits/std_streambuf.h: Likewise.
* src/Makefile.am: Remove use of -fimplicit-templates.
* src/Makefile.in: Regenerated.
* src/locale-inst.cc: Explicitly instantiate more functions.
* src/msic-inst.cc: Likewise.
* src/string-inst.cc: Likewise.
2001-02-05 Benjamin Kosnik <bkoz@redhat.com> 2001-02-05 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): New * acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): New

4
libstdc++-v3/include/bits/locale_facets.tcc
View File

@ -970,7 +970,7 @@ namespace std
// Generic helper function // Generic helper function
template<typename _CharT, typename _OutIter> template<typename _CharT, typename _OutIter>
static _OutIter _OutIter
_S_output_float(_OutIter __s, ios_base& __io, _CharT __fill, _S_output_float(_OutIter __s, ios_base& __io, _CharT __fill,
const char* __sptr, size_t __slen) const char* __sptr, size_t __slen)
{ {
@ -980,7 +980,7 @@ namespace std
// Partial specialization for ostreambuf_iterator. // Partial specialization for ostreambuf_iterator.
template<typename _CharT> template<typename _CharT>
static ostreambuf_iterator<_CharT> ostreambuf_iterator<_CharT>
_S_output_float(ostreambuf_iterator<_CharT> __s, ios_base& __io, _S_output_float(ostreambuf_iterator<_CharT> __s, ios_base& __io,
_CharT __fill, const char* __sptr, size_t __slen) _CharT __fill, const char* __sptr, size_t __slen)
{ {

2
libstdc++-v3/include/bits/std_streambuf.h
View File

@ -43,7 +43,7 @@
namespace std { namespace std {
template<typename _CharT, typename _Traits> template<typename _CharT, typename _Traits>
static streamsize streamsize
_S_copy_streambufs(basic_ios<_CharT, _Traits>& _ios, _S_copy_streambufs(basic_ios<_CharT, _Traits>& _ios,
basic_streambuf<_CharT, _Traits>* __sbin, basic_streambuf<_CharT, _Traits>* __sbin,
basic_streambuf<_CharT, _Traits>* __sbout); basic_streambuf<_CharT, _Traits>* __sbout);

14
libstdc++-v3/src/Makefile.am
View File

@ -21,7 +21,7 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA. ## USA.
## $Id: Makefile.am,v 1.67 2001/02/03 09:01:44 bkoz Exp $ ## $Id: Makefile.am,v 1.68 2001/02/06 06:32:01 bkoz Exp $
AUTOMAKE_OPTIONS = 1.3 gnits AUTOMAKE_OPTIONS = 1.3 gnits
MAINT_CHARSET = latin1 MAINT_CHARSET = latin1
@ -298,13 +298,13 @@ myinstallheaders:
# for things like vptrs, type_info bits, etc. when using # for things like vptrs, type_info bits, etc. when using
# -fno-implicit-templates. # -fno-implicit-templates.
misc-inst.o: misc-inst.cc misc-inst.o: misc-inst.cc
$(CXXCOMPILE) -fimplicit-templates -c $< $(CXXCOMPILE) -c $<
misc-inst.lo: misc-inst.cc misc-inst.lo: misc-inst.cc
$(LTCXXCOMPILE) -fimplicit-templates -c $< $(LTCXXCOMPILE) -c $<
locale-inst.o: locale-inst.cc locale-inst.o: locale-inst.cc
$(CXXCOMPILE) -fimplicit-templates -c $< $(CXXCOMPILE) -c $<
locale-inst.lo: locale-inst.cc locale-inst.lo: locale-inst.cc
$(LTCXXCOMPILE) -fimplicit-templates -c $< $(LTCXXCOMPILE) -c $<
# Use special rules for the deprecated source files so that they find # Use special rules for the deprecated source files so that they find
# deprecated include files. # deprecated include files.
@ -315,9 +315,9 @@ strstream.o: strstream.cc
# Make wstring-inst.cc from string-inst.cc # Make wstring-inst.cc from string-inst.cc
wstring-inst.o: string-inst.cc wstring-inst.o: string-inst.cc
$(CXXCOMPILE) -fimplicit-templates -c -DC=wchar_t $< -o $@ $(CXXCOMPILE) -c -DC=wchar_t $< -o $@
wstring-inst.lo: string-inst.cc wstring-inst.lo: string-inst.cc
$(LTCXXCOMPILE) -fimplicit-templates -c -DC=wchar_t $< -o $@ $(LTCXXCOMPILE) -c -DC=wchar_t $< -o $@
# Alexandre put this in here for some libtool-related reason. # Alexandre put this in here for some libtool-related reason.

12
libstdc++-v3/src/Makefile.in
View File

@ -567,13 +567,13 @@ myinstallheaders:
# for things like vptrs, type_info bits, etc. when using # for things like vptrs, type_info bits, etc. when using
# -fno-implicit-templates. # -fno-implicit-templates.
misc-inst.o: misc-inst.cc misc-inst.o: misc-inst.cc
$(CXXCOMPILE) -fimplicit-templates -c $< $(CXXCOMPILE) -c $<
misc-inst.lo: misc-inst.cc misc-inst.lo: misc-inst.cc
$(LTCXXCOMPILE) -fimplicit-templates -c $< $(LTCXXCOMPILE) -c $<
locale-inst.o: locale-inst.cc locale-inst.o: locale-inst.cc
$(CXXCOMPILE) -fimplicit-templates -c $< $(CXXCOMPILE) -c $<
locale-inst.lo: locale-inst.cc locale-inst.lo: locale-inst.cc
$(LTCXXCOMPILE) -fimplicit-templates -c $< $(LTCXXCOMPILE) -c $<
# Use special rules for the deprecated source files so that they find # Use special rules for the deprecated source files so that they find
# deprecated include files. # deprecated include files.
@ -584,9 +584,9 @@ strstream.o: strstream.cc
# Make wstring-inst.cc from string-inst.cc # Make wstring-inst.cc from string-inst.cc
wstring-inst.o: string-inst.cc wstring-inst.o: string-inst.cc
$(CXXCOMPILE) -fimplicit-templates -c -DC=wchar_t $< -o $@ $(CXXCOMPILE) -c -DC=wchar_t $< -o $@
wstring-inst.lo: string-inst.cc wstring-inst.lo: string-inst.cc
$(LTCXXCOMPILE) -fimplicit-templates -c -DC=wchar_t $< -o $@ $(LTCXXCOMPILE) -c -DC=wchar_t $< -o $@
# Alexandre put this in here for some libtool-related reason. # Alexandre put this in here for some libtool-related reason.
all: libstdc++.INC all: libstdc++.INC

26
libstdc++-v3/src/locale-inst.cc
View File

@ -282,5 +282,31 @@ namespace std {
locale::facet** locale::facet**
fill_n<locale::facet**, unsigned long, locale::facet*> fill_n<locale::facet**, unsigned long, locale::facet*>
(locale::facet**, unsigned long, locale::facet* const&); (locale::facet**, unsigned long, locale::facet* const&);
template
const numpunct<char>&
use_facet(const locale&);
template
void __sink_unused_warning<locale::facet*>(locale::facet*);
template
__normal_iterator<locale::facet**,
vector<locale::facet*> >
fill_n(__normal_iterator<locale::facet**,
vector<locale::facet*> >,
unsigned, locale::facet* const&);
template
void
fill (__normal_iterator<locale::facet**,
vector<locale::facet*> >,
__normal_iterator<locale::facet**,
vector<locale::facet*> >,
locale::facet* const&);
template
const collate<char>&
use_facet<collate<char> >(const locale&);
} //std } //std

66
libstdc++-v3/src/misc-inst.cc
View File

@ -1,6 +1,6 @@
// Explicit instantiation file. // Explicit instantiation file.
// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc. // Copyright (C) 1997-1999, 2000, 2001 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // 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 // software; you can redistribute it and/or modify it under the
@ -43,6 +43,7 @@
#include <bits/basic_ios.tcc> #include <bits/basic_ios.tcc>
#include <bits/std_istream.h> #include <bits/std_istream.h>
#include <bits/std_ostream.h> #include <bits/std_ostream.h>
#include <bits/std_string.h>
// NB: unnecessary if the .h headers include these // NB: unnecessary if the .h headers include these
#ifndef _GLIBCPP_FULLY_COMPLIANT_HEADERS #ifndef _GLIBCPP_FULLY_COMPLIANT_HEADERS
@ -239,6 +240,69 @@ namespace std {
(vector<string>::const_iterator, vector<string>::const_iterator, (vector<string>::const_iterator, vector<string>::const_iterator,
string*, _Bool<false>); string*, _Bool<false>);
template
void
__sink_unused_warning<char>(char);
#ifdef _GLIBCPP_USE_WCHAR_T
template
void
__sink_unused_warning<wchar_t>(wchar_t);
#endif
template
void
__sink_unused_warning<ostreambuf_iterator<char> >
(ostreambuf_iterator<char>);
#ifdef _GLIBCPP_USE_WCHAR_T
template
void
__sink_unused_warning<ostreambuf_iterator<wchar_t> >
(ostreambuf_iterator<wchar_t>);
#endif
template
void
_S_pad_char (basic_ios<char>&, char*, const char*, int, int);
#ifdef _GLIBCPP_USE_WCHAR_T
template
void
_S_pad_char (basic_ios<wchar_t>&, wchar_t*, const wchar_t*, int, int);
#endif
template
ostreambuf_iterator<char>
_S_pad_numeric (ostreambuf_iterator<char>, _Ios_Fmtflags, char, int,
const char*, const char*, const char*);
#ifdef _GLIBCPP_USE_WCHAR_T
template
ostreambuf_iterator<wchar_t>
_S_pad_numeric (ostreambuf_iterator<wchar_t>, _Ios_Fmtflags, wchar_t, int,
const wchar_t*, const wchar_t*, const wchar_t*);
#endif
template
ostreambuf_iterator<char>
_S_output_float (ostreambuf_iterator<char>, ios_base&, char,
const char*, unsigned);
#ifdef _GLIBCPP_USE_WCHAR_T
template
ostreambuf_iterator<wchar_t>
_S_output_float (ostreambuf_iterator<wchar_t>, ios_base&, wchar_t,
const wchar_t*, unsigned);
#endif
template
int
_S_copy_streambufs(basic_ios<char>&,
basic_streambuf<char>*,
basic_streambuf<char>*);
#ifdef _GLIBCPP_USE_WCHAR_T
template
int
_S_copy_streambufs(basic_ios<wchar_t>&,
basic_streambuf<wchar_t>*,
basic_streambuf<wchar_t>*);
#endif
} //std } //std

12
libstdc++-v3/src/string-inst.cc
View File

@ -71,6 +71,9 @@ namespace std
S::_S_construct<S::iterator> S::_S_construct<S::iterator>
(S::iterator, S::iterator, const allocator<C>&, forward_iterator_tag); (S::iterator, S::iterator, const allocator<C>&, forward_iterator_tag);
template
S::basic_string(C*, C*, const allocator<C>&);
template template
S::basic_string(S::iterator, S::iterator, const allocator<C>&); S::basic_string(S::iterator, S::iterator, const allocator<C>&);
@ -87,6 +90,15 @@ namespace std
C* C*
S::_S_construct(const C*, const C*, const allocator<C>&, S::_S_construct(const C*, const C*, const allocator<C>&,
forward_iterator_tag); forward_iterator_tag);
template
C*
S::_S_construct (C*, C*, const allocator<C>&,
forward_iterator_tag);
template
void
__destroy_aux<S*>(S*, S*, _Bool<false>);
} // namespace std } // namespace std