Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ jobs:
- name: Configure CMake
run: |
export PATH=${{env.ANDROID_NDK_HOME}}:$PATH
cmake -DCMAKE_TOOLCHAIN_FILE=${{env.ANDROID_NDK_HOME}}/build/cmake/android.toolchain.cmake -DANDROID_NATIVE_API_LEVEL=${{env.ANDROID_SDK_VERSION}} -DANDROID_ABI=${{env.ANDROID_ABI}} -DBEAM_IPFS_SUPPORT=Off -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} .
cmake -DCMAKE_TOOLCHAIN_FILE=${{env.ANDROID_NDK_HOME}}/build/cmake/android.toolchain.cmake -DANDROID_NATIVE_API_LEVEL=${{env.ANDROID_SDK_VERSION}} -DANDROID_ABI=${{env.ANDROID_ABI}} -DBEAM_IPFS_SUPPORT=Off -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_FLAGS="-Wno-error=deprecated-literal-operator -Wno-deprecated-literal-operator" .

###############################################################################
# Build
Expand Down
1 change: 1 addition & 0 deletions 3rdparty/libbitcoin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ if(MSVC)
target_compile_options(${TARGET_NAME} PUBLIC "/wd4245")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4505")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4996")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4702")
elseif(APPLE)
target_compile_options(${TARGET_NAME} PUBLIC -Wno-mismatched-tags)
target_compile_options(${TARGET_NAME} PUBLIC -Wno-missing-braces)
Expand Down
1 change: 1 addition & 0 deletions 3rdparty/libbitcoin/src/chain/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ if(MSVC)
target_compile_options(${TARGET_NAME} PUBLIC "/wd4273")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4251")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4189")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4702")
elseif(APPLE OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(${TARGET_NAME} PUBLIC -Wno-mismatched-tags)
target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable)
Expand Down
1 change: 1 addition & 0 deletions 3rdparty/libbitcoin/src/machine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ if(MSVC)
target_compile_options(${TARGET_NAME} PUBLIC "/wd4245")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4505")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4996")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4702")
elseif(APPLE)
target_compile_options(${TARGET_NAME} PUBLIC -Wno-mismatched-tags)
target_compile_options(${TARGET_NAME} PUBLIC -Wno-missing-braces)
Expand Down
1 change: 1 addition & 0 deletions 3rdparty/libbitcoin/src/message/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ if(MSVC)
target_compile_options(${TARGET_NAME} PUBLIC "/wd4245")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4505")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4996")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4702")
elseif(APPLE)
target_compile_options(${TARGET_NAME} PUBLIC -Wno-mismatched-tags)
target_compile_options(${TARGET_NAME} PUBLIC -Wno-missing-braces)
Expand Down
1 change: 1 addition & 0 deletions 3rdparty/libbitcoin/src/wallet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ if(MSVC)
target_compile_options(${TARGET_NAME} PUBLIC "/wd4458")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4996")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4251")
target_compile_options(${TARGET_NAME} PUBLIC "/wd4702")
elseif(APPLE OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(${TARGET_NAME} PUBLIC -Wno-mismatched-tags)
target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable)
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ else()
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 15 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 15)
add_compile_definitions(_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) #boost@1.76/1.76.0_4/include/boost/container_hash/hash.hpp:131:33
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-enum-constexpr-conversion -Wno-error=enum-constexpr-conversion")
endif()
# Temporal solution
if(ANDROID AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
Expand Down
2 changes: 1 addition & 1 deletion explorer/adapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ class Adapter : public Node::IObserver, public IAdapter {
{
return (Rules::Consensus::Pbft == Rules::get().m_Consensus) ?
MakeDecimalDelta<3>(t_ms) :
MakeDecimal(static_cast<int64_t>(t_ms / 1000));
MakeDecimalDelta<0>(static_cast<int64_t>(t_ms / 1000));
}

json get_status() override {
Expand Down
1 change: 1 addition & 0 deletions utility/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ endif()

if (MSVC)
set_source_files_properties(logger.cpp PROPERTIES COMPILE_FLAGS "/wd4996") # 'std::fpos<_Mbstatet>::seekpos': warning STL4019: The member std::fpos::seekpos() is non-Standard
add_compile_options(/wd4702)
endif()

add_library(utility STATIC ${UTILITY_SRC} ${IO_SRC})
Expand Down
7 changes: 5 additions & 2 deletions wallet/core/wallet_db.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5311,9 +5311,12 @@ namespace beam::wallet
stm.bind(6, isRead);
stm.step();

for (const auto sub : m_subscribers)
if (sqlite3_changes(_db) > 0)
{
sub->onIMSaved(time, counterpart, message, isIncome);
for (const auto sub : m_subscribers)
{
sub->onIMSaved(time, counterpart, message, isIncome);
}
}
}

Expand Down
Loading