changeset 9234:e2f6dcade4c6

Avoid implicit Array<octave_idx_type> instantiation
author Michael Goffioul <michael.goffioul@gmail.com>
date Thu, 21 May 2009 21:00:00 +0100
parents b935bbfab7c4
children b03953732530
files src/ChangeLog src/TEMPLATE-INST/Array-os.cc
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-21  Michael Goffioul  <michael.goffioul@gmail.com>
+
+	* TEMPLATE-INST/Array-os.cc: Add "extern template" declaration for
+	Array<octave_idx_type> to avoid implicit instantiation (and duplicate
+	symbols at link-time) [Win32]
+
 2009-05-20  John W. Eaton  <jwe@octave.org>
 
 	* pt-assign.cc (maybe_warn_former_built_in_variable):
--- a/src/TEMPLATE-INST/Array-os.cc
+++ b/src/TEMPLATE-INST/Array-os.cc
@@ -30,6 +30,7 @@
 #include "Array.cc"
 
 extern template class OCTAVE_API Array<bool>;
+extern template class OCTAVE_API Array<octave_idx_type>;
 
 #include "oct-stream.h"