diff --git a/CMakeLists.txt b/CMakeLists.txt index d9911b520..171f37d26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -229,7 +229,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-register") endif() + MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-copy" DEBUG RELEASE RELWITHDEBINFO MINSIZEREL) +MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-declarations" DEBUG RELEASE RELWITHDEBINFO MINSIZEREL) MY_CHECK_AND_SET_COMPILER_FLAG("-Werror -Wall") SET (ENGINE_LDFLAGS "-Wl,--no-as-needed -Wl,--add-needed") diff --git a/dbcon/execplan/calpontselectexecutionplan.cpp b/dbcon/execplan/calpontselectexecutionplan.cpp index c53cd86ab..cf7034a85 100644 --- a/dbcon/execplan/calpontselectexecutionplan.cpp +++ b/dbcon/execplan/calpontselectexecutionplan.cpp @@ -42,7 +42,7 @@ using namespace querytele; namespace { template -struct deleter : public unary_function +struct deleter { void operator()(T& x) { diff --git a/dbcon/execplan/constantcolumn.h b/dbcon/execplan/constantcolumn.h index 970ffd2a4..29a9c4986 100644 --- a/dbcon/execplan/constantcolumn.h +++ b/dbcon/execplan/constantcolumn.h @@ -197,7 +197,7 @@ class ConstantColumn : public ReturnedColumn /** Constant column on the filte can always be moved into derived table */ virtual void setDerivedTable() { - fDerivedTable = "*"; + fDerivedTable = std::string("*"); } private: diff --git a/dbcon/execplan/constantfilter.cpp b/dbcon/execplan/constantfilter.cpp index 18f872e03..a1de7c77f 100644 --- a/dbcon/execplan/constantfilter.cpp +++ b/dbcon/execplan/constantfilter.cpp @@ -40,7 +40,7 @@ using namespace std; namespace { template -struct deleter : public unary_function +struct deleter { void operator()(T& x) { diff --git a/dbcon/joblist/distributedenginecomm.cpp b/dbcon/joblist/distributedenginecomm.cpp index 1ddfb2842..b594515ce 100644 --- a/dbcon/joblist/distributedenginecomm.cpp +++ b/dbcon/joblist/distributedenginecomm.cpp @@ -159,7 +159,7 @@ struct EngineCommRunner }; template -struct QueueShutdown : public unary_function +struct QueueShutdown { void operator()(T& x) { diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp index cab229ebe..ca0dce1fd 100644 --- a/dbcon/joblist/joblistfactory.cpp +++ b/dbcon/joblist/joblistfactory.cpp @@ -980,7 +980,7 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo // doesn't really make sense. if (op != AggregateColumn::SUM && op != AggregateColumn::DISTINCT_SUM && op != AggregateColumn::AVG && op != AggregateColumn::DISTINCT_AVG && - op != AggregateColumn::BIT_AND && op != AggregateColumn::BIT_OR && + op != AggregateColumn::BIT_AND && op != AggregateColumn::BIT_OR && op != AggregateColumn::BIT_XOR) { updateAggregateColType(aggc, srcp, op, jobInfo); @@ -1323,11 +1323,11 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo } template -class Uniqer : public unary_function +class Uniqer { private: typedef typename T::mapped_type Mt_; - class Pred : public unary_function + class Pred { public: Pred(const Mt_& retCol) : fRetCol(retCol) diff --git a/dbcon/joblist/largehashjoin.h b/dbcon/joblist/largehashjoin.h index b8369062a..0e4bed517 100644 --- a/dbcon/joblist/largehashjoin.h +++ b/dbcon/joblist/largehashjoin.h @@ -41,29 +41,6 @@ #include #include -#ifndef _HASHFIX_ -#define _HASHFIX_ -#ifndef __LP64__ -// This is needed for /usr/include/c++/4.1.1/tr1/functional on 32-bit compiles -// tr1_hashtable_define_trivial_hash(long long unsigned int); -#include "jl_logger.h" -namespace std -{ -namespace tr1 -{ -template <> -struct hash : public std::unary_function -{ - std::size_t operator()(long long unsigned int val) const - { - return static_cast(val); - } -}; -} // namespace tr1 -} // namespace std -#endif -#endif - #include #include #include diff --git a/versioning/BRM/brmtypes.h b/versioning/BRM/brmtypes.h index 76598fc81..a462cf79a 100644 --- a/versioning/BRM/brmtypes.h +++ b/versioning/BRM/brmtypes.h @@ -37,28 +37,6 @@ #include #ifndef _UNORDERED_MAP_FIX_ #define _UNORDERED_MAP_FIX_ -#ifndef __LP64__ - -#if __GNUC__ == 4 && __GNUC_MINOR__ < 2 -// This is needed for /usr/include/c++/4.1.1/tr1/functional on 32-bit compiles -// tr1_hashtable_define_trivial_hash(long long int); -namespace std -{ -namespace tr1 -{ -template <> -struct hash : public std::unary_function -{ - std::size_t operator()(long long int val) const - { - return static_cast(val); - } -}; -} // namespace tr1 -} // namespace std -#endif // if __GNUC__ - -#endif // if !__LP64__ #endif //_UNORDERED_MAP_FIX_ #else #include diff --git a/writeengine/bulk/we_colextinf.h b/writeengine/bulk/we_colextinf.h index 08277c229..c2ea108a5 100644 --- a/writeengine/bulk/we_colextinf.h +++ b/writeengine/bulk/we_colextinf.h @@ -124,7 +124,7 @@ class ColExtInfEntry * the last input Row number in the extent, as the key. */ //------------------------------------------------------------------------------ -struct uint64Hasher : public std::unary_function +struct uint64Hasher { std::size_t operator()(RID val) const { diff --git a/writeengine/bulk/we_extentstripealloc.h b/writeengine/bulk/we_extentstripealloc.h index 9a44baac2..6d491dfaa 100644 --- a/writeengine/bulk/we_extentstripealloc.h +++ b/writeengine/bulk/we_extentstripealloc.h @@ -101,7 +101,7 @@ class AllocExtEntry * the corresponding column OID as the key. */ //------------------------------------------------------------------------------ -struct AllocExtHasher : public std::unary_function +struct AllocExtHasher { std::size_t operator()(OID val) const { diff --git a/writeengine/client/we_clients.cpp b/writeengine/client/we_clients.cpp index b6d66e2e9..d8eb01b2c 100644 --- a/writeengine/client/we_clients.cpp +++ b/writeengine/client/we_clients.cpp @@ -149,7 +149,7 @@ struct WEClientRunner }; template -struct QueueShutdown : public unary_function +struct QueueShutdown { void operator()(T& x) {