Mercurial > hg > octave-terminal
changeset 3109:fcb2f5063e7f
[project @ 1997-11-20 08:52:42 by jwe]
author | jwe |
---|---|
date | Thu, 20 Nov 1997 08:52:46 +0000 |
parents | bb7ffd516332 |
children | fe2d1ae8926b |
files | ChangeLog src/ChangeLog src/DLD-FUNCTIONS/filter.cc src/ov-cx-mat.cc src/ov-re-mat.cc src/ov-str-mat.cc |
diffstat | 6 files changed, 7 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -3,12 +3,7 @@ * aclocal.m4 (OCTAVE_CXX_NEW_FRIEND_TEMPLATE_DECL): Don't forget to call AC_LANG_RESTORE. - * acconfig.h: Add undefs for NO_EXTERN_TEMPLATE_DECLS and - NEED_TEMPLATE_FCN_SPECS. - * configure.in (CXX_VERSION): Require 2.7.2 or later. - Define NO_EXTERN_TEMPLATE_DECLS and NEED_TEMPLATE_FCN_SPECS if - using egcs or 2.8.x or later. Wed Nov 19 01:38:58 1997 Mumit Khan <khan@dhaka.xraylith.wisc.edu>
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,7 @@ Wed Nov 19 02:05:40 1997 Mumit Khan <khan@dhaka.xraylith.wisc.edu> * DLD-FUNCTIONS/filter.cc: Don't include extern template decls if - NO_EXTERN_TEMPLATE_DECLS is defined. + CXX_NEW_FRIEND_TEMPLATE_DECL is defined. * ov-cx-mat.cc: Likewise. * ov-re-mat.cc: Likewise. * ov-str-mat.cc: Likewise.
--- a/src/DLD-FUNCTIONS/filter.cc +++ b/src/DLD-FUNCTIONS/filter.cc @@ -36,7 +36,7 @@ #include "error.h" #include "oct-obj.h" -#if !defined (NO_EXTERN_TEMPLATE_DECLS) +#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL) extern MArray<double> filter (MArray<double>&, MArray<double>&, MArray<double>&); @@ -127,7 +127,7 @@ return y; } -#if !defined (NO_EXTERN_TEMPLATE_DECLS) +#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL) extern MArray<double> filter (MArray<double>&, MArray<double>&, MArray<double>&, MArray<double>&);
--- a/src/ov-cx-mat.cc +++ b/src/ov-cx-mat.cc @@ -122,7 +122,7 @@ return retval; } -#if !defined (NO_EXTERN_TEMPLATE_DECLS) +#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL) extern void assign (Array2<Complex>&, const Array2<Complex>&); #endif @@ -163,7 +163,7 @@ } } -#if !defined (NO_EXTERN_TEMPLATE_DECLS) +#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL) extern void assign (Array2<Complex>&, const Array2<double>&); #endif