Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FormerLurker/ArcWelderLib.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFormerLurker <hochgebe@gmail.com>2020-05-12 21:22:43 +0300
committerFormerLurker <hochgebe@gmail.com>2020-05-12 21:22:43 +0300
commit406f62a662596091d7ceb2736b23622e0f8826f7 (patch)
treec7b86cdf8e047208b2d5e76039430ae605a481fb /PyArcWelder
parent1b83f4db6dfb74490aaae48d7e6315b939741131 (diff)
Fix some clang errors
Diffstat (limited to 'PyArcWelder')
-rw-r--r--PyArcWelder/py_arc_welder.cpp2
-rw-r--r--PyArcWelder/py_arc_welder_extension.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/PyArcWelder/py_arc_welder.cpp b/PyArcWelder/py_arc_welder.cpp
index 0410c68..7844cfe 100644
--- a/PyArcWelder/py_arc_welder.cpp
+++ b/PyArcWelder/py_arc_welder.cpp
@@ -52,7 +52,7 @@ bool py_arc_welder::on_progress_(arc_welder_progress progress)
{
PyObject* py_dict = py_arc_welder::build_py_progress(progress);
if (py_dict == NULL)
- return NULL;
+ return false;
PyObject* func_args = Py_BuildValue("(O)", py_dict);
if (func_args == NULL)
{
diff --git a/PyArcWelder/py_arc_welder_extension.cpp b/PyArcWelder/py_arc_welder_extension.cpp
index 1b7021e..ca60196 100644
--- a/PyArcWelder/py_arc_welder_extension.cpp
+++ b/PyArcWelder/py_arc_welder_extension.cpp
@@ -211,7 +211,7 @@ extern "C"
u8"cancelled",
results.cancelled,
u8"message",
- results.message,
+ results.message.c_str(),
u8"progress",
p_progress
);