Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GCC 9.1 fixes /monero#5613+#5865 #149

Merged
merged 3 commits into from
Sep 23, 2019
Merged

GCC 9.1 fixes /monero#5613+#5865 #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8fdb50
Fix GCC 9.1 build warnings /monero#5613
moneromooo-monero Jun 8, 2019
8cba01b
cmake: do not use -mmitigate-rop on GCC >= 9.1 /monero#5613
moneromooo-monero Jun 8, 2019
6e8eb4e
simplewallet: fix warnings about useless std::move /monero#5865
moneromooo-monero Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,8 +650,11 @@ else()
add_cxx_flag_if_supported(-fstack-clash-protection CXX_SECURITY_FLAGS)
endif()

add_c_flag_if_supported(-mmitigate-rop C_SECURITY_FLAGS)
add_cxx_flag_if_supported(-mmitigate-rop CXX_SECURITY_FLAGS)
# Removed in GCC 9.1 (or before ?), but still accepted, so spams the output
if (NOT (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1))
add_c_flag_if_supported(-mmitigate-rop C_SECURITY_FLAGS)
add_cxx_flag_if_supported(-mmitigate-rop CXX_SECURITY_FLAGS)
endif()

# linker
if (NOT WIN32)
Expand Down
5 changes: 5 additions & 0 deletions contrib/epee/include/net/net_utils_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,11 @@ namespace net_utils
m_current_speed_up(0)
{}

connection_context_base(const connection_context_base& a): connection_context_base()
{
set_details(a.m_connection_id, a.m_remote_address, a.m_is_income);
}

connection_context_base& operator=(const connection_context_base& a)
{
set_details(a.m_connection_id, a.m_remote_address, a.m_is_income);
Expand Down
12 changes: 12 additions & 0 deletions src/device/device_ledger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,18 @@ namespace hw {
AKout = keys.AKout;
}

ABPkeys &ABPkeys::operator=(const ABPkeys& keys) {
if (&keys == this)
return *this;
Aout = keys.Aout;
Bout = keys.Bout;
is_subaddress = keys.is_subaddress;
index = keys.index;
Pout = keys.Pout;
AKout = keys.AKout;
return *this;
}

bool Keymap::find(const rct::key& P, ABPkeys& keys) const {
size_t sz = ABP.size();
for (size_t i=0; i<sz; i++) {
Expand Down
1 change: 1 addition & 0 deletions src/device/device_ledger.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ namespace hw {
ABPkeys(const rct::key& A, const rct::key& B, const bool is_subaddr, size_t index, const rct::key& P,const rct::key& AK);
ABPkeys(const ABPkeys& keys) ;
ABPkeys() {index=0;is_subaddress=false;}
ABPkeys &operator=(const ABPkeys &keys);
};

class Keymap {
Expand Down
8 changes: 4 additions & 4 deletions src/simplewallet/simplewallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3694,7 +3694,7 @@ boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::pr
}
success_msg_writer() << "**********************************************************************";

return std::move(password);
return password;
}
//----------------------------------------------------------------------------------------------------
boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::program_options::variables_map& vm,
Expand Down Expand Up @@ -3741,7 +3741,7 @@ boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::pr
}


return std::move(password);
return password;
}

//----------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -3778,7 +3778,7 @@ boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::pr
return {};
}

return std::move(password);
return password;
}
//----------------------------------------------------------------------------------------------------
boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::program_options::variables_map& vm,
Expand Down Expand Up @@ -3831,7 +3831,7 @@ boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::pr
return {};
}

return std::move(password);
return password;
}
//----------------------------------------------------------------------------------------------------
bool simple_wallet::open_wallet(const boost::program_options::variables_map& vm)
Expand Down