nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

The nameless union in node.h has been removed because not all compilers

Browse source 
support it.
This commit is contained in:
jeggermo 2001-10-19 12:04:12 +00:00
commit 0bbe7b84cb
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
eo/app/gpsymreg/main.cc
View file

@ -45,8 +45,6 @@ typedef eoPop<EoType> Pop;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
// SC debug
#ifdef NEVERDEF // patch to make run the installation of EO
// the vector containing the possible nodes // the vector containing the possible nodes
vector<Node> initSequence; vector<Node> initSequence;
@ -161,7 +159,6 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#endif // NEVERDEF
return 1; return 1;
}; };

11
eo/app/gpsymreg/node.h
View file

@ -20,6 +20,8 @@
#ifndef _NODE_H #ifndef _NODE_H
#define _NODE_H #define _NODE_H
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <cmath> // for finite(double) function #include <cmath> // for finite(double) function
@ -57,14 +59,17 @@ struct Operation
typedef string Label; typedef string Label;
// if your compiler allows you to have nameless unions you can make this a
// union by removing the //'s below
union //union
{ //{
UnaryFunction uFunction; UnaryFunction uFunction;
BinaryFunction bFunction; BinaryFunction bFunction;
VariableID id; VariableID id;
double constant; double constant;
}; //};
Label label; Label label;