-Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo

This commit is contained in:
Pavel Kirienko
2016-07-29 16:02:31 +03:00
parent 38a241a90a
commit 32d8851dde
6 changed files with 12 additions and 10 deletions
+2 -1
View File
@@ -123,7 +123,8 @@ if (DEBUG_BUILD)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -pedantic -Wfloat-equal -Wconversion")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion -Wcast-align -Wmissing-declarations -Wlogical-op")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdouble-promotion -Wswitch-enum -Wtype-limits -Wno-error=array-bounds")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wzero-as-null-pointer-constant")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wzero-as-null-pointer-constant -Wnon-virtual-dtor -Woverloaded-virtual")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-promo")
set(cpp03_flags "-std=c++03 -Wno-variadic-macros -Wno-long-long -Wno-zero-as-null-pointer-constant")
set(optim_flags "-O3 -DNDEBUG -g0")
else ()
+1 -1
View File
@@ -43,7 +43,7 @@ struct ServiceCallResultHandler
}
else
{
std::cout << "MISMATCH: status=" << last_status << ", last_server_node_id="
std::cout << "MISMATCH: status=" << int(last_status) << ", last_server_node_id="
<< int(last_server_node_id.get()) << ", last response:\n" << last_response << std::endl;
return false;
}
+5 -5
View File
@@ -73,11 +73,11 @@ struct PairableCanDriver : public uavcan::ICanDriver, public uavcan::ICanIface
virtual uavcan::ICanIface* getIface(uavcan::uint8_t iface_index)
{
if (iface_index == 0)
{
return this;
}
return UAVCAN_NULLPTR;
return (iface_index == 0) ? this : UAVCAN_NULLPTR;
}
virtual const uavcan::ICanIface* getIface(uavcan::uint8_t iface_index) const
{
return (iface_index == 0) ? this : UAVCAN_NULLPTR;
}
virtual uavcan::uint8_t getNumIfaces() const { return 1; }
@@ -43,7 +43,7 @@ public:
{
const uavcan::MonotonicDuration ts = SystemClockDriver().getMonotonic() - startup_ts_;
std::cout << "EVENT [" << id_ << "]\t" << ts.toString() << "\t"
<< code << "\t" << getEventName(code) << "\t" << argument << std::endl;
<< int(code) << "\t" << getEventName(code) << "\t" << argument << std::endl;
event_log_.push_back(EventLogEntry(code, argument));
}
@@ -67,7 +67,7 @@ public:
}
}
std::cout << "No such event in the event log, code " << code << ", log length " << event_log_.size()
std::cout << "No such event in the event log, code " << int(code) << ", log length " << event_log_.size()
<< std::endl;
throw std::runtime_error("EventTracer::getLastEventArgumentOrFail()");
+1
View File
@@ -270,6 +270,7 @@ public:
}
virtual uavcan::ICanIface* getIface(uavcan::uint8_t iface_index) { return &ifaces.at(iface_index); }
virtual const uavcan::ICanIface* getIface(uavcan::uint8_t iface_index) const { return &ifaces.at(iface_index); }
virtual uavcan::uint8_t getNumIfaces() const { return uavcan::uint8_t(ifaces.size()); }
};
@@ -102,7 +102,7 @@ struct Transfer
os << "ts_m=" << ts_monotonic
<< " ts_utc=" << ts_utc
<< " prio=" << int(priority.get())
<< " tt=" << transfer_type
<< " tt=" << int(transfer_type)
<< " tid=" << int(transfer_id.get())
<< " snid=" << int(src_node_id.get())
<< " dnid=" << int(dst_node_id.get())