# HG changeset patch # User jwe # Date 780951421 0 # Node ID 3dece74ae10c848ffb9181f93c0160c42247367b # Parent c9f3cb77478d3387e9ccff8f5f91eb52b279b3d4 [project @ 1994-09-30 18:54:26 by jwe] diff --git a/liboctave/Array.cc b/liboctave/Array.cc --- a/liboctave/Array.cc +++ b/liboctave/Array.cc @@ -1002,8 +1002,8 @@ delete old_rep; } -#if defined (__GNUG__) && defined (USE_EXTERNAL_TEMPLATES) -#if defined (OCTAVE_SOURCE) +#if defined (__GNUG__) +#if defined (OCTAVE_SOURCE) && defined (USE_EXTERNAL_TEMPLATES) typedef Array array_type_double; typedef Array2 array2_type_double; @@ -1017,20 +1017,6 @@ #include "tree-const.h" typedef Array array_type_tree_constant; -#elif defined (USER_TYPEDEFS) - -// Users can generate their own .o files with their own types, as many -// times as they like. USER_TYPEDEFS should be defined to be the name -// of an include file that contains typdefs for the desired types. -// -// For example, if my-types.h contains typedefs for the Array types -// you are interested in, you might compile this file with the command -// -// g++ -fexternal-templates -DUSE_EXTERNAL_TEMPLATES \ -// -DUSER_TYPEDEFS=\"my-types.h\" - -#include USER_TYPEDEFS - #endif #endif diff --git a/src/Queue.h b/src/Queue.h --- a/src/Queue.h +++ b/src/Queue.h @@ -20,10 +20,6 @@ #ifndef _Queue_h #define _Queue_h 1 -#if defined (__GNUG__) && defined (USE_EXTERNAL_TEMPLATES) -//#pragma interface -#endif - template class Queue diff --git a/src/SLQueue.h b/src/SLQueue.h --- a/src/SLQueue.h +++ b/src/SLQueue.h @@ -20,10 +20,6 @@ #if !defined (_SLQueue_h) #define _SLQueue_h 1 -#if defined (__GNUG__) && defined (USE_EXTERNAL_TEMPLATES) -//#pragma interface -#endif - #include "SLList.h" #include "Queue.h"