Mercurial > octave-nkf

changeset 9287:a407e894ec74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
conditionally enable MSVC-specific DiagArray2<T>::Proxy instantiations
author Jaroslav Hajek <highegg@gmail.com>
date Tue, 02 Jun 2009 21:29:09 +0200
parents c2248cc4821a
children 7621f0b0e588
files liboctave/Array-C.cc liboctave/Array-d.cc liboctave/Array-f.cc liboctave/Array-fC.cc liboctave/ChangeLog
diffstat 5 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array-C.cc	Tue Jun 02 09:57:44 2009 +0200
+++ b/liboctave/Array-C.cc	Tue Jun 02 21:29:09 2009 +0200
@@ -106,7 +106,9 @@
 #include "DiagArray2.h"
 #include "DiagArray2.cc"
 
+#ifdef _MSC_VER
 template class OCTAVE_API DiagArray2<Complex>::Proxy;
+#endif
 template class OCTAVE_API DiagArray2<Complex>;
 
 /*
--- a/liboctave/Array-d.cc	Tue Jun 02 09:57:44 2009 +0200
+++ b/liboctave/Array-d.cc	Tue Jun 02 21:29:09 2009 +0200
@@ -102,7 +102,9 @@
 #include "DiagArray2.h"
 #include "DiagArray2.cc"
 
+#ifdef _MSC_VER
 template class OCTAVE_API DiagArray2<double>::Proxy;
+#endif
 template class OCTAVE_API DiagArray2<double>;
 
 /*
--- a/liboctave/Array-f.cc	Tue Jun 02 09:57:44 2009 +0200
+++ b/liboctave/Array-f.cc	Tue Jun 02 21:29:09 2009 +0200
@@ -102,7 +102,9 @@
 #include "DiagArray2.h"
 #include "DiagArray2.cc"
 
+#ifdef _MSC_VER
 template class OCTAVE_API DiagArray2<float>::Proxy;
+#endif
 template class OCTAVE_API DiagArray2<float>;
 
 /*
--- a/liboctave/Array-fC.cc	Tue Jun 02 09:57:44 2009 +0200
+++ b/liboctave/Array-fC.cc	Tue Jun 02 21:29:09 2009 +0200
@@ -107,7 +107,9 @@
 #include "DiagArray2.h"
 #include "DiagArray2.cc"
 
+#ifdef _MSC_VER
 template class OCTAVE_API DiagArray2<FloatComplex>::Proxy;
+#endif
 template class OCTAVE_API DiagArray2<FloatComplex>;
 
 /*
--- a/liboctave/ChangeLog	Tue Jun 02 09:57:44 2009 +0200
+++ b/liboctave/ChangeLog	Tue Jun 02 21:29:09 2009 +0200
@@ -1,3 +1,11 @@
+2009-06-02  Jaroslav Hajek  <highegg@gmail.com>
+
+	* Array-C.cc (class DiagArray2<Complex>::Proxy): Only explicitly
+	instantiate DiagArray2<T>::Proxy on MSVC.
+	* Array-d.cc (class DiagArray2<double>::Proxy): Ditto.
+	* Array-f.cc (class DiagArray2<float>::Proxy): Ditto.
+	* Array-fC.cc (class DiagArray2<FloatComplex>::Proxy): Ditto.
+
 2009-05-26  John W. Eaton  <jwe@octave.org>
 
 	* pathsearch.h (dir_path::path_sep_char (char),