diff --git a/SRC/reliability/domain/distributions/PythonRV.h b/SRC/reliability/domain/distributions/PythonRV.h index d796394a40..b365300200 100644 --- a/SRC/reliability/domain/distributions/PythonRV.h +++ b/SRC/reliability/domain/distributions/PythonRV.h @@ -29,7 +29,17 @@ #ifndef PythonRV_h #define PythonRV_h +#ifdef _WIN32 +#include +#endif + +#ifdef _DEBUG +#undef _DEBUG #include +#define _DEBUG +#else +#include +#endif #include diff --git a/SRC/reliability/domain/functionEvaluator/PythonEvaluator.cpp b/SRC/reliability/domain/functionEvaluator/PythonEvaluator.cpp index 89100cafe1..dc91a5281c 100644 --- a/SRC/reliability/domain/functionEvaluator/PythonEvaluator.cpp +++ b/SRC/reliability/domain/functionEvaluator/PythonEvaluator.cpp @@ -56,7 +56,7 @@ PythonEvaluator::PythonEvaluator( current_val(0), moduleName() { theExpression = 0; - int exprLen = strlen(passed_fileName); + int exprLen = (int)strlen(passed_fileName); fileName = new char[exprLen + 1]; strcpy(fileName, passed_fileName); } @@ -145,7 +145,7 @@ int PythonEvaluator::setVariables() { int PythonEvaluator::setExpression(const char *passedExpression) { if (theExpression != 0) delete[] theExpression; - int exprLen = strlen(passedExpression); + int exprLen = (int)strlen(passedExpression); theExpression = new char[exprLen + 1]; strcpy(theExpression, passedExpression); diff --git a/SRC/reliability/domain/functionEvaluator/PythonEvaluator.h b/SRC/reliability/domain/functionEvaluator/PythonEvaluator.h index 7935e637e3..7bf85acff7 100644 --- a/SRC/reliability/domain/functionEvaluator/PythonEvaluator.h +++ b/SRC/reliability/domain/functionEvaluator/PythonEvaluator.h @@ -30,9 +30,20 @@ #ifndef PythonEvaluator_h #define PythonEvaluator_h +#ifdef _WIN32 +#include +#endif + +#ifdef _DEBUG +#undef _DEBUG +#include +#define _DEBUG +#else +#include +#endif + #include #include -#include #include #include #include