The nameless union in node.h has been removed because not all compilers
support it.
This commit is contained in:
parent
5897d0062f
commit
0bbe7b84cb
2 changed files with 9 additions and 7 deletions
|
|
@ -45,8 +45,6 @@ typedef eoPop<EoType> 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<Node> initSequence;
|
||||
|
|
@ -161,7 +159,6 @@ int main(int argc, char *argv[])
|
|||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
#endif // NEVERDEF
|
||||
return 1;
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
#ifndef _NODE_H
|
||||
#define _NODE_H
|
||||
|
||||
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <cmath> // 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;
|
||||
|
|
|
|||
Reference in a new issue