mirror/oatpp
2
0
Fork 0
mirror of https://github.com/oatpp/oatpp.git synced 2025-03-31 18:30:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #826 from fhuberts/fix-Wlogical-op

Browse Source 
Fix compiler warnings (-Wlogical-op)
This commit is contained in:
Leonid Stryzhevskyi 2023-08-19 10:22:56 +03:00 committed by GitHub
commit 72807d83ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/compiler-flags.cmake
View File

@ -160,7 +160,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
#add_compiler_flags(5.1 "-Wsuggest-final-types")
add_compiler_flags(6.1 "-Wduplicated-cond")
#add_compiler_flags(6.1 "-Wlogical-op")
add_compiler_flags(6.1 "-Wlogical-op")
add_compiler_flags(6.1 "-Wnull-dereference")
add_compiler_flags(7.1 "-Wduplicated-branches")

28
src/oatpp/network/tcp/Connection.cpp
View File

@ -76,6 +76,11 @@ Connection::~Connection(){
close();
}
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wlogical-op"
#endif
v_io_size Connection::write(const void *buff, v_buff_size count, async::Action& action){
#if defined(WIN32) || defined(_WIN32)
@ -115,7 +120,10 @@ v_io_size Connection::write(const void *buff, v_buff_size count, async::Action&
if(result < 0) {
auto e = errno;
if(e == EAGAIN || e == EWOULDBLOCK){
bool retry = ((e == EAGAIN) || (e == EWOULDBLOCK));
if(retry){
if(m_mode == data::stream::ASYNCHRONOUS) {
action = oatpp::async::Action::createIOWaitAction(m_handle, oatpp::async::Action::IOEventType::IO_EVENT_WRITE);
}
@ -139,6 +147,15 @@ v_io_size Connection::write(const void *buff, v_buff_size count, async::Action&
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wlogical-op"
#endif
v_io_size Connection::read(void *buff, v_buff_size count, async::Action& action){
#if defined(WIN32) || defined(_WIN32)
@ -173,7 +190,10 @@ v_io_size Connection::read(void *buff, v_buff_size count, async::Action& action)
if(result < 0) {
auto e = errno;
if(e == EAGAIN || e == EWOULDBLOCK){
bool retry = ((e == EAGAIN) || (e == EWOULDBLOCK));
if(retry){
if(m_mode == data::stream::ASYNCHRONOUS) {
action = oatpp::async::Action::createIOWaitAction(m_handle, oatpp::async::Action::IOEventType::IO_EVENT_READ);
}
@ -197,6 +217,10 @@ v_io_size Connection::read(void *buff, v_buff_size count, async::Action& action)
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#if defined(WIN32) || defined(_WIN32)
void Connection::setStreamIOMode(oatpp::data::stream::IOMode ioMode) {