Mercurial > hg > octave-lyh
changeset 755:0a9ac29dfd4d
[project @ 1994-10-02 15:13:26 by jwe]
author | jwe |
---|---|
date | Sun, 02 Oct 1994 15:13:26 +0000 |
parents | daf899e42dfc |
children | bcf4dff844a5 |
files | src/Map.cc src/Map.h src/SLStack.cc src/SLStack.h src/Stack.cc src/Stack.h |
diffstat | 6 files changed, 9 insertions(+), 105 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Map.cc +++ b/src/Map.cc @@ -38,10 +38,6 @@ #include "config.h" #endif -#if defined (__GNUG__) && defined (USE_EXTERNAL_TEMPLATES) -#pragma implementation -#endif - #include <iostream.h> #include "Map.h" @@ -112,8 +108,7 @@ // table entry. Not terrible, but not wonderful either. template <class C> -static inline -int +static int goodCHptr (CHNode<C> *t) { return ((((unsigned) t) & 1) == 0); @@ -121,15 +116,14 @@ // This sucks, but avoids g++ 2.6.0 `type unification failed' errors. -void * +static void * index_to_CHptr (int i) { return (void *) ((i << 1) + 1); } template <class C> -static inline -int +static int CHptr_to_index (CHNode<C> *t) { return ((unsigned) t) >> 1; @@ -281,27 +275,9 @@ return v; } -#if defined (__GNUG__) && defined (USE_EXTERNAL_TEMPLATES) -#if defined (OCTAVE_SOURCE) - -#include "tree-const.h" -typedef Map<tree_constant> map_type_tree_constant; -typedef CHNode<tree_constant> chnode_type_tree_constant; -typedef CHMap<tree_constant> chmap_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 Map 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 +/* +;;; Local Variables: *** +;;; mode: C++ *** +;;; page-delimiter: "^/\\*" *** +;;; End: *** +*/
--- a/src/Map.h +++ b/src/Map.h @@ -37,10 +37,6 @@ #if ! defined (octave_Map_h) #define octave_Map_h 1 -#if defined (__GNUG__) && defined (USE_EXTERNAL_TEMPLATES) -#pragma interface -#endif - #include <Pix.h> #include "utils.h" @@ -156,10 +152,6 @@ int OK (void) const; }; -#if defined (__GNUG__) && ! defined (USE_EXTERNAL_TEMPLATES) -#include "Map.cc" -#endif - #endif /*
--- a/src/SLStack.cc +++ b/src/SLStack.cc @@ -25,10 +25,6 @@ #include "config.h" #endif -#if defined (__GNUG__) && defined (USE_EXTERNAL_TEMPLATES) -#pragma implementation -#endif - #include "SLStack.h" template <class T> @@ -116,28 +112,6 @@ p.clear (); } -#ifdef __GNUG__ -#if defined (OCTAVE_SOURCE) && defined (USE_EXTERNAL_TEMPLATES) - -typedef SLStack<int> slstack_type_int; -typedef SLStack<char *> slstack_type_p_char; - -#include "symtab.h" -typedef SLStack<symbol_def *> slstack_type_p_symbol_def; - -#include "token.h" -typedef SLStack<token *> slstack_type_p_token; - -#include "tree-base.h" -#include "tree-expr.h" -typedef SLStack<tree_matrix *> slstack_type_p_tree_matrix; - -#include "unwind-prot.h" -typedef SLStack<unwind_elem> slstack_type_unwind_elem; - -#endif -#endif - /* ;;; Local Variables: *** ;;; mode: C++ ***
--- a/src/SLStack.h +++ b/src/SLStack.h @@ -19,10 +19,6 @@ #if !defined (_SLStack_h) #define _SLStack_h 1 -#if defined (__GNUG__) && defined (USE_EXTERNAL_TEMPLATES) -#pragma interface -#endif - #include "SLList.h" #include "Stack.h" @@ -54,10 +50,6 @@ int OK (void); }; -#if defined (__GNUG__) && ! defined (USE_EXTERNAL_TEMPLATES) -#include "SLStack.cc" -#endif - #endif /*
--- a/src/Stack.cc +++ b/src/Stack.cc @@ -27,10 +27,6 @@ #include "config.h" #endif -#if defined (__GNUG__) && defined (USE_EXTERNAL_TEMPLATES) -#pragma implementation -#endif - #include <iostream.h> #include "Stack.h" @@ -42,28 +38,6 @@ cerr << msg; } -#ifdef __GNUG__ -#if defined (OCTAVE_SOURCE) && defined (USE_EXTERNAL_TEMPLATES) - -typedef Stack<int> stack_type_int; -typedef Stack<char *> stack_type_p_char; - -#include "symtab.h" -typedef Stack<symbol_def *> stack_type_p_symbol_def; - -#include "token.h" -typedef Stack<token *> stack_type_p_token; - -#include "tree-base.h" -#include "tree-expr.h" -typedef Stack<tree_matrix *> stack_type_p_tree_matrix; - -#include "unwind-prot.h" -typedef Stack<unwind_elem> stack_type_unwind_elem; - -#endif -#endif - /* ;;; Local Variables: *** ;;; mode: C++ ***