adding fix for building OpenSeesPy in Debug mode.

aschellenberg74 · Oct 29, 2024 · ff9c709 · ff9c709
1 parent 96ec048
commit ff9c709
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git 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 <corecrt.h>
+#endif
+
+#ifdef _DEBUG
+#undef _DEBUG
 #include <Python.h>
+#define _DEBUG
+#else
+#include <Python.h>
+#endif
 
 #include <RandomVariable.h>
 

diff --git 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
@@ -30,9 +30,20 @@
 #ifndef PythonEvaluator_h
 #define PythonEvaluator_h
 
+#ifdef _WIN32
+#include <corecrt.h>
+#endif
+
+#ifdef _DEBUG
+#undef _DEBUG
+#include <Python.h>
+#define _DEBUG
+#else
+#include <Python.h>
+#endif
+
 #include <Domain.h>
 #include <FunctionEvaluator.h>
-#include <Python.h>
 #include <ReliabilityDomain.h>
 #include <vector>
 #include <string>