diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fb495dc6..f733f0485 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,7 +231,7 @@ IF (MASK_LONGDOUBLE) ENDIF() if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-enum-enum-conversion -Wno-register") + MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-enum-enum-conversion -Wno-register -Wno-typedef-redefinition") elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-register") endif() diff --git a/dbcon/ddlpackage/CMakeLists.txt b/dbcon/ddlpackage/CMakeLists.txt index 5557ed3ff..1c986eced 100644 --- a/dbcon/ddlpackage/CMakeLists.txt +++ b/dbcon/ddlpackage/CMakeLists.txt @@ -10,7 +10,7 @@ FLEX_TARGET(ddl_scan ddl.l ${CMAKE_CURRENT_BINARY_DIR}/ddl-scan.cpp COMPILE_FLAG ADD_FLEX_BISON_DEPENDENCY(ddl_scan ddl_gram) set_source_files_properties(ddl-scan.cpp PROPERTIES COMPILE_FLAGS "-Wno-register -Wno-deprecated-register -Wno-sign-compare -DYY_NO_INPUT") - +set_source_files_properties(ddl-gram.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable") ########### next target ############### include_directories(${CMAKE_CURRENT_BINARY_DIR}) # to pick up flex/bison output diff --git a/dbcon/dmlpackage/CMakeLists.txt b/dbcon/dmlpackage/CMakeLists.txt index e999cdae1..ccd0b0985 100644 --- a/dbcon/dmlpackage/CMakeLists.txt +++ b/dbcon/dmlpackage/CMakeLists.txt @@ -11,7 +11,7 @@ FLEX_TARGET(dml_scan dml.l ${CMAKE_CURRENT_BINARY_DIR}/dml-scan.cpp COMPILE_FLAG ADD_FLEX_BISON_DEPENDENCY(dml_scan dml_gram) set_source_files_properties(dml-scan.cpp PROPERTIES COMPILE_FLAGS "-Wno-register -Wno-deprecated-register -Wno-sign-compare -DYY_NO_INPUT") - +set_source_files_properties(dml-gram.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable") ########### next target ############### include_directories(${CMAKE_CURRENT_BINARY_DIR}) # to pick up flex/bison output diff --git a/dbcon/joblist/tupleaggregatestep.cpp b/dbcon/joblist/tupleaggregatestep.cpp index 03093c18c..89286f3e0 100644 --- a/dbcon/joblist/tupleaggregatestep.cpp +++ b/dbcon/joblist/tupleaggregatestep.cpp @@ -2051,7 +2051,6 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(JobInfo& jobInfo, vector& c List_iterator_fast value_it(thd->lex->value_list); updateCP->queryType(CalpontSelectExecutionPlan::UPDATE); ci->stats.fQueryType = updateCP->queryType(); - uint32_t cnt = 0; tr1::unordered_set timeStampColumnNames; while ((item = (Item_field*)field_it++)) { - cnt++; string tmpTableName = bestTableName(item); diff --git a/primitives/blockcache/iomanager.cpp b/primitives/blockcache/iomanager.cpp index b1b727797..6dbf31446 100644 --- a/primitives/blockcache/iomanager.cpp +++ b/primitives/blockcache/iomanager.cpp @@ -388,7 +388,6 @@ void* thr_popper(ioManager* arg) utils::setThreadName("thr_popper"); ioManager* iom = arg; FileBufferMgr* fbm; - int totalRqst = 0; fileRequest* fr = 0; BRM::LBID_t lbid = 0; BRM::OID_t oid = 0; @@ -748,7 +747,6 @@ void* thr_popper(ioManager* arg) longSeekOffset = (uint64_t)offset * (uint64_t)fileBlockSize; lldiv_t cmpOffFact = lldiv(longSeekOffset, (4LL * 1024LL * 1024LL)); - totalRqst++; uint32_t readCount = 0; uint32_t bytesRead = 0; diff --git a/primitives/linux-port/dictionary.cpp b/primitives/linux-port/dictionary.cpp index 40cac5014..2e8c2ad67 100644 --- a/primitives/linux-port/dictionary.cpp +++ b/primitives/linux-port/dictionary.cpp @@ -79,7 +79,7 @@ void PrimitiveProcessor::p_TokenByScan(const TokenByScanRequestHeader* h, TokenB const uint8_t* niceBlock; // block cast to a byte-indexed type const uint8_t* niceInput; // h cast to a byte-indexed type const uint16_t* offsets; - int offsetIndex, argIndex, argsOffset; + int offsetIndex, argsOffset; bool cmpResult = false; int i; const char* sig; @@ -122,7 +122,6 @@ void PrimitiveProcessor::p_TokenByScan(const TokenByScanRequestHeader* h, TokenB siglen = offsets[offsetIndex - 1] - offsets[offsetIndex]; sig = reinterpret_cast(&niceBlock[offsets[offsetIndex]]); argsOffset = sizeof(TokenByScanRequestHeader); - argIndex = 0; args = reinterpret_cast(&niceInput[argsOffset]); if (eqFilter) @@ -161,7 +160,6 @@ void PrimitiveProcessor::p_TokenByScan(const TokenByScanRequestHeader* h, TokenB goto store; argsOffset += sizeof(uint16_t) + args->len; - argIndex++; args = (DataValue*)&niceInput[argsOffset]; cmpResult = compare(cs, h->COP2, sig, siglen, args->data, args->len); @@ -186,7 +184,6 @@ void PrimitiveProcessor::p_TokenByScan(const TokenByScanRequestHeader* h, TokenB goto store; argsOffset += sizeof(uint16_t) + args->len; - argIndex++; args = (DataValue*)&niceInput[argsOffset]; } diff --git a/storage-manager/src/unit_tests.cpp b/storage-manager/src/unit_tests.cpp index dc37007a7..200bb7d54 100644 --- a/storage-manager/src/unit_tests.cpp +++ b/storage-manager/src/unit_tests.cpp @@ -344,11 +344,9 @@ void metadataJournalTest(std::size_t size, off_t offset) cmd->flen = std::strlen(filename); memcpy(&cmd->filename, filename, cmd->flen); data = (uint64_t*)&cmd->filename[cmd->flen]; - int count = 0; for (uint64_t i = 0; i < (size / sizeof(uint64_t)); i++) { data[i] = i; - count++; } hdr->type = SM_MSG_START; hdr->payloadLen = sizeof(*cmd) + cmd->flen + cmd->count; @@ -384,11 +382,9 @@ void metadataJournalTest_append(std::size_t size) cmd->flen = std::strlen(filename); memcpy(&cmd->filename, filename, cmd->flen); data = (uint64_t*)&cmd->filename[cmd->flen]; - int count = 0; for (uint64_t i = 0; i < (size / sizeof(uint64_t)); i++) { data[i] = i; - count++; } hdr->type = SM_MSG_START; hdr->payloadLen = sizeof(*cmd) + cmd->flen + cmd->count; diff --git a/utils/common/robin_hood.h b/utils/common/robin_hood.h index 94a9ed488..8c4694345 100644 --- a/utils/common/robin_hood.h +++ b/utils/common/robin_hood.h @@ -193,13 +193,7 @@ static Counts& counts() #define ROBIN_HOOD_PRIVATE_DEFINITION_HAS_NATIVE_WCHART() 1 #endif -// workaround missing "is_trivially_copyable" in g++ < 5.0 -// See https://stackoverflow.com/a/31798726/48181 -#if defined(__GNUC__) && __GNUC__ < 5 -#define ROBIN_HOOD_IS_TRIVIALLY_COPYABLE(...) __has_trivial_copy(__VA_ARGS__) -#else #define ROBIN_HOOD_IS_TRIVIALLY_COPYABLE(...) std::is_trivially_copyable<__VA_ARGS__>::value -#endif // helpers for C++ versions, see https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html #define ROBIN_HOOD_PRIVATE_DEFINITION_CXX() __cplusplus diff --git a/utils/dataconvert/dataconvert.cpp b/utils/dataconvert/dataconvert.cpp index 5f3af5a2e..147417aaf 100644 --- a/utils/dataconvert/dataconvert.cpp +++ b/utils/dataconvert/dataconvert.cpp @@ -1131,7 +1131,7 @@ bool mysql_str_to_time(const string& input, Time& output, long decimals) output.minute = 59; output.second = 59; output.msecond = exp10(decimals) - 1; - output.is_neg = 1; + output.is_neg = -1; } // If neither of the above match then we return a 0 time else diff --git a/utils/dataconvert/dataconvert.h b/utils/dataconvert/dataconvert.h index 908961caa..e42514ce7 100644 --- a/utils/dataconvert/dataconvert.h +++ b/utils/dataconvert/dataconvert.h @@ -971,7 +971,7 @@ struct Time signed is_neg : 1; // NULL column value = 0xFFFFFFFFFFFFFFFE - Time() : msecond(-2), second(-1), minute(-1), hour(-1), day(-1), is_neg(0b1) + Time() : msecond(-2), second(-1), minute(-1), hour(-1), day(-1), is_neg(-1) { } @@ -990,7 +990,7 @@ struct Time : msecond(msec), second(sec), minute(min), hour(h), day(d), is_neg(neg) { if (h < 0) - is_neg = 0b1; + is_neg = -1; } int64_t convertToMySQLint() const; @@ -1003,7 +1003,7 @@ inline void Time::reset() second = -1; minute = -1; hour = -1; - is_neg = 0b1; + is_neg = -1; day = -1; }