diff --git a/dbcon/joblist/columncommand-jl.h b/dbcon/joblist/columncommand-jl.h index 4a864a253..7f700766e 100644 --- a/dbcon/joblist/columncommand-jl.h +++ b/dbcon/joblist/columncommand-jl.h @@ -45,13 +45,13 @@ class ColumnCommandJL : public CommandJL ColumnCommandJL(const ColumnCommandJL&, const DictStepJL&); virtual ~ColumnCommandJL(); - virtual void createCommand(messageqcpp::ByteStream& bs) const; - virtual void runCommand(messageqcpp::ByteStream& bs) const; - void setLBID(uint64_t rid, uint32_t dbroot); - uint8_t getTableColumnType(); - virtual std::string toString(); - uint16_t getWidth(); - CommandType getCommandType() + virtual void createCommand(messageqcpp::ByteStream& bs) const override; + virtual void runCommand(messageqcpp::ByteStream& bs) const override; + void setLBID(uint64_t rid, uint32_t dbroot) override; + uint8_t getTableColumnType() override; + virtual std::string toString() override; + uint16_t getWidth() override; + CommandType getCommandType() override { return COLUMN_COMMAND; } diff --git a/primitives/linux-port/column.cpp b/primitives/linux-port/column.cpp index ff74406a9..974a277da 100644 --- a/primitives/linux-port/column.cpp +++ b/primitives/linux-port/column.cpp @@ -539,16 +539,6 @@ inline bool isNullValue(const T val, const T NULL_VALUE) return val == NULL_VALUE; } -template <> -inline bool isNullValue(const int64_t val, const int64_t NULL_VALUE) -{ - //@bug 339 might be a token here - // TODO: what's up with the alternative NULL here? - constexpr const int64_t ALT_NULL_VALUE = 0xFFFFFFFFFFFFFFFELL; - - return (val == NULL_VALUE || val == ALT_NULL_VALUE); -} - // // FILTER A COLUMN VALUE //