Created
May 7, 2017 17:11
-
-
Save phinicota/cf1c0cbae068962b4f973b202fc59949 to your computer and use it in GitHub Desktop.
this fixes https://github.com/parnold-x/nasc/issues/32
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/libqalculatenasc/QalculateNasc.cc b/libqalculatenasc/QalculateNasc.cc | |
index f736629..59ab4ac 100644 | |
--- a/libqalculatenasc/QalculateNasc.cc | |
+++ b/libqalculatenasc/QalculateNasc.cc | |
@@ -3,6 +3,8 @@ | |
#include "QalculateNasc.h" | |
#include <memory> | |
#include <thread> | |
+#include <algorithm> | |
+ | |
std::shared_ptr<Calculator> calc; | |
MathStructure *mstruct; | |
@@ -196,7 +198,7 @@ extern "C" { | |
calc->resetVariables(); | |
} | |
- void abort() { | |
+ void abortt() { | |
calc->abort(); | |
} | |
@@ -274,4 +276,4 @@ std::string intern_calc (std::string input) { | |
std::string result_str = mstruct->print (printops); | |
return result_str;//calc->localizeExpression (result_str); | |
-} | |
\ No newline at end of file | |
+} | |
diff --git a/libqalculatenasc/QalculateNasc.h b/libqalculatenasc/QalculateNasc.h | |
index b950ab9..e4fae64 100644 | |
--- a/libqalculatenasc/QalculateNasc.h | |
+++ b/libqalculatenasc/QalculateNasc.h | |
@@ -12,7 +12,7 @@ char* Calculator_calculate(const char* string); | |
char* Calculator_calculate_store_variable(const char* input, const char* variable); | |
void clear_variables(); | |
-void abort(); | |
+void abortt(); | |
void delete_calculator(); | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment