aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2012-03-20 17:47:07 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2012-03-20 17:47:07 +0000
commit513d051988266d50c13677b5bc3fae7e3028867b (patch)
tree4464b738f62f978f0c8e8ca69908599822b42455 /gcc
parent73f46872b4d140254e9d167138e2e8e92be989c3 (diff)
downloadgcc-513d051988266d50c13677b5bc3fae7e3028867b.zip
gcc-513d051988266d50c13677b5bc3fae7e3028867b.tar.gz
gcc-513d051988266d50c13677b5bc3fae7e3028867b.tar.bz2
* doc/extend.texi (Template Instantiation): Remove anachronisms.
From-SVN: r185584
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/doc/extend.texi18
2 files changed, 9 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 439e152..c2743ed 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-20 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ * doc/extend.texi (Template Instantiation): Remove anachronisms.
+
2012-03-20 Jakub Jelinek <jakub@redhat.com>
PR target/52607
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index 3a2e1d4..bb43825 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -15162,16 +15162,7 @@ GNU/Linux or Solaris 2, or on Microsoft Windows, G++ supports the
Borland model. On other systems, G++ implements neither automatic
model.
-A future version of G++ will support a hybrid model whereby the compiler
-will emit any instantiations for which the template definition is
-included in the compile, and store template definitions and
-instantiation context information into the object file for the rest.
-The link wrapper will extract that information as necessary and invoke
-the compiler to produce the remaining instantiations. The linker will
-then combine duplicate instantiations.
-
-In the mean time, you have the following options for dealing with
-template instantiations:
+You have the following options for dealing with template instantiations:
@enumerate
@item
@@ -15233,9 +15224,10 @@ compile it without @option{-fno-implicit-templates} so you get all of the
instances required by your explicit instantiations (but not by any
other files) without having to specify them as well.
-G++ has extended the template instantiation syntax given in the ISO
-standard to allow forward declaration of explicit instantiations
-(with @code{extern}), instantiation of the compiler support data for a
+The ISO C++ 2011 standard allows forward declaration of explicit
+instantiations (with @code{extern}). G++ supports explicit instantiation
+declarations in C++98 mode and has extended the template instantiation
+syntax to support instantiation of the compiler support data for a
template class (i.e.@: the vtable) without instantiating any of its
members (with @code{inline}), and instantiation of only the static data
members of a template class, without the support data or member