From 4812cc260f8c9c61c959fb92ed23929dd37654bd Mon Sep 17 00:00:00 2001 From: Ahmed Irfan Date: Wed, 5 Feb 2020 21:25:50 -0800 Subject: [PATCH 1/2] fix a couple of warnings --- src/engine/DnCManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/DnCManager.cpp b/src/engine/DnCManager.cpp index 04164a9a0d..7d2b2b3da0 100644 --- a/src/engine/DnCManager.cpp +++ b/src/engine/DnCManager.cpp @@ -77,7 +77,7 @@ void DnCManager::freeMemoryIfNeeded() { if ( _workload ) { - SubQuery *subQuery; + SubQuery *subQuery = NULL; while ( !_workload->empty() ) { _workload->pop( subQuery ); @@ -347,7 +347,7 @@ void DnCManager::initialDivide( SubQueries &subQueries ) ( new LargestIntervalDivider( inputVariables ) ); } - String queryId = ""; + String queryId; // Create a new case split QueryDivider::InputRegion initialRegion; InputQuery *inputQuery = _baseEngine->getInputQuery(); From de8ab8ef1fdf03ac52f6fbc299c77c7b5eaa296a Mon Sep 17 00:00:00 2001 From: Ahmed Irfan Date: Mon, 30 Mar 2020 12:02:12 -0700 Subject: [PATCH 2/2] drop python2 support --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a58d82bb7b..e151c0d547 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,8 +11,8 @@ option(RUN_REGRESS_TEST "run regression tests on build" OFF) option(RUN_SYSTEM_TEST "run system tests on build" OFF) option(RUN_MEMORY_TEST "run cxxtest testing with ASAN ON" ON) -set(DEFAULT_PYTHON_VERSION "3" CACHE STRING "Default Python version 2/3") -set(PYTHON_VERSIONS_SUPPORTED 2 3) +set(DEFAULT_PYTHON_VERSION "3" CACHE STRING "Default Python version 3") +set(PYTHON_VERSIONS_SUPPORTED 3) list(FIND PYTHON_VERSIONS_SUPPORTED ${DEFAULT_PYTHON_VERSION} index) if(index EQUAL -1) message(FATAL_ERROR "python version must be one of ${PYTHON_VERSIONS_SUPPORTED}")