Skip to content

Commit 9acf1a4

Browse files
committed
Removed unused header, handle newer Python API change, C++ lang standard default to c++17
1 parent 5527874 commit 9acf1a4

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

SConstruct

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@ env.CBAddVariables(
2121
('python_version', 'Set python version', '3'),
2222
BoolVariable('with_tpl', 'Enable TPL', True),
2323
BoolVariable('with_gui', 'Enable graphical user interface', True),
24-
BoolVariable('wrap_glibc', 'Enable GlibC function wrapping', False)
24+
BoolVariable('wrap_glibc', 'Enable GlibC function wrapping', False),
25+
EnumVariable('cxxstd', 'Set C++ language standard', 'c++17',
26+
allowed_values = ('c++14', 'c++17', 'c++20')),
2527
)
2628
conf = env.CBConfigure()
2729

30+
2831
# Config vars
2932
env.Replace(PACKAGE_VERSION = version)
3033
env.Replace(PACKAGE_AUTHOR = '%(name)s <%(email)s>' % pkg_meta['author'])

src/camotics/view/View.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <cbang/String.h>
3232
#include <cbang/Catch.h>
3333
#include <cbang/util/HumanNumber.h>
34-
#include <cbang/time/HumanTime.h>
3534
#include <cbang/log/Logger.h>
3635
#include <cbang/config/Options.h>
3736

src/python.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ PyMODINIT_FUNC PyInit_camotics() {
105105
cb::Logger::instance().setLogPrefix(true);
106106
cb::Logger::instance().setLogColor(false);
107107

108+
#if PY_MAJOR_VERSION < 3 || PY_MINOR_VERSION < 7
108109
if (!PyEval_ThreadsInitialized()) PyEval_InitThreads();
110+
#endif
109111

110112
PyObject *mod = PyModule_Create(&module);
111113
if (!mod) return 0;

0 commit comments

Comments
 (0)