# HG changeset patch # User jwe # Date 880015966 0 # Node ID fcb2f5063e7f96380e38dcbaa5a368820a147009 # Parent bb7ffd516332a11fc962527167dfa8df319efaf1 [project @ 1997-11-20 08:52:42 by jwe] diff --git a/ChangeLog b/ChangeLog --- 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 diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,7 @@ Wed Nov 19 02:05:40 1997 Mumit Khan * 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. diff --git a/src/DLD-FUNCTIONS/filter.cc b/src/DLD-FUNCTIONS/filter.cc --- 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 filter (MArray&, MArray&, MArray&); @@ -127,7 +127,7 @@ return y; } -#if !defined (NO_EXTERN_TEMPLATE_DECLS) +#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL) extern MArray filter (MArray&, MArray&, MArray&, MArray&); diff --git a/src/ov-cx-mat.cc b/src/ov-cx-mat.cc --- 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&, const Array2&); #endif @@ -163,7 +163,7 @@ } } -#if !defined (NO_EXTERN_TEMPLATE_DECLS) +#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL) extern void assign (Array2&, const Array2&); #endif diff --git a/src/ov-re-mat.cc b/src/ov-re-mat.cc --- a/src/ov-re-mat.cc +++ b/src/ov-re-mat.cc @@ -110,7 +110,7 @@ return retval; } -#if !defined (NO_EXTERN_TEMPLATE_DECLS) +#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL) extern void assign (Array2&, const Array2&); #endif diff --git a/src/ov-str-mat.cc b/src/ov-str-mat.cc --- a/src/ov-str-mat.cc +++ b/src/ov-str-mat.cc @@ -94,7 +94,7 @@ return retval; } -#if !defined (NO_EXTERN_TEMPLATE_DECLS) +#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL) extern void assign (Array2&, const Array2&); #endif