From 0bbe7b84cb8056eb3ce643687bc607693d7f1728 Mon Sep 17 00:00:00 2001 From: jeggermo Date: Fri, 19 Oct 2001 12:04:12 +0000 Subject: [PATCH] The nameless union in node.h has been removed because not all compilers support it. --- eo/app/gpsymreg/main.cc | 3 --- eo/app/gpsymreg/node.h | 13 +++++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/eo/app/gpsymreg/main.cc b/eo/app/gpsymreg/main.cc index f9b6aeb0..abf8a587 100644 --- a/eo/app/gpsymreg/main.cc +++ b/eo/app/gpsymreg/main.cc @@ -45,8 +45,6 @@ typedef eoPop Pop; int main(int argc, char *argv[]) { -// SC debug -#ifdef NEVERDEF // patch to make run the installation of EO // the vector containing the possible nodes vector initSequence; @@ -161,7 +159,6 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } -#endif // NEVERDEF return 1; }; diff --git a/eo/app/gpsymreg/node.h b/eo/app/gpsymreg/node.h index c22e1f88..362aae40 100644 --- a/eo/app/gpsymreg/node.h +++ b/eo/app/gpsymreg/node.h @@ -20,6 +20,8 @@ #ifndef _NODE_H #define _NODE_H + + #include #include #include // for finite(double) function @@ -57,15 +59,18 @@ struct Operation typedef string Label; - - union - { + // if your compiler allows you to have nameless unions you can make this a + // union by removing the //'s below + + //union + //{ UnaryFunction uFunction; BinaryFunction bFunction; VariableID id; double constant; - }; + //}; + Label label; Type type;