Skip to content
Open
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
11 changes: 5 additions & 6 deletions depends/packages/boost.mk
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package=boost
$(package)_version=1_71_0
# $(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(subst _,.,$($(package)_version))/source/
$(package)_download_path=https://github.com/decenomy/depends/raw/main/
$(package)_version=1_84_0
$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(subst _,.,$($(package)_version))/source/
# $(package)_download_path=https://github.com/decenomy/depends/raw/main/
$(package)_file_name=boost_$($(package)_version).tar.bz2
$(package)_sha256_hash=d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee
$(package)_sha256_hash=cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454
$(package)_patches=fix_gcc_11_3_compile.patch

define $(package)_set_vars
Expand Down Expand Up @@ -31,8 +31,7 @@ $(package)_cxxflags_linux=-fPIC
endef

define $(package)_preprocess_cmds
echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam && \
patch -p1 -i $($(package)_patch_dir)/fix_gcc_11_3_compile.patch
echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
endef

define $(package)_config_cmds
Expand Down
1 change: 1 addition & 0 deletions src/httpserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <signal.h>
#include <future>

#include <deque>
#include <event2/event.h>
#include <event2/http.h>
#include <event2/thread.h>
Expand Down
3 changes: 3 additions & 0 deletions src/qt/clientmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.


#include "clientmodel.h"

#include "bantablemodel.h"
Expand All @@ -29,6 +30,8 @@
#include <QDebug>
#include <QTimer>

using namespace boost::placeholders;

static const int64_t nClientStartupTime = GetTime();
// Last tip update notification
static int64_t nLastBlockTipUpdateNotification = 0;
Expand Down
1 change: 1 addition & 0 deletions src/qt/pivx/pivxgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#define BASE_WINDOW_MIN_HEIGHT 620
#define BASE_WINDOW_MIN_WIDTH 1100

using namespace boost::placeholders;

const QString PIVXGUI::DEFAULT_WALLET = "~Default";

Expand Down
2 changes: 2 additions & 0 deletions src/qt/pivx/splash.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

#include <iostream>

using namespace boost::placeholders;

Splash::Splash(Qt::WindowFlags f, const NetworkStyle* networkStyle) :
QWidget(0, f | Qt::SplashScreen), ui(new Ui::Splash)
{
Expand Down
2 changes: 2 additions & 0 deletions src/qt/transactiontablemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#include <QtConcurrent/QtConcurrent>
#include <QFuture>

using namespace boost::placeholders;

// Amount column is right-aligned it contains numbers
static int column_alignments[] = {
Qt::AlignLeft | Qt::AlignVCenter, /* status */
Expand Down
1 change: 1 addition & 0 deletions src/qt/walletmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <QSet>
#include <QTimer>

using namespace boost::placeholders;

WalletModel::WalletModel(CWallet* wallet, OptionsModel* optionsModel, QObject* parent) : QObject(parent), wallet(wallet), walletWrapper(*wallet),
optionsModel(optionsModel),
Expand Down
2 changes: 2 additions & 0 deletions src/validationinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#include "validationinterface.h"

using namespace boost::placeholders;

static CMainSignals g_signals;

CMainSignals& GetMainSignals()
Expand Down
5 changes: 3 additions & 2 deletions src/wallet/walletdb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <boost/thread.hpp>
#include <fstream>


static uint64_t nAccountingEntryNumber = 0;

static std::atomic<unsigned int> nWalletDBUpdateCounter;
Expand Down Expand Up @@ -1069,7 +1068,9 @@ bool AttemptBackupWallet(const CWallet& wallet, const fs::path& pathSrc, const f
LogPrintf("cannot backup to wallet source file %s\n", pathDest.string());
return false;
}
#if BOOST_VERSION >= 105800 /* BOOST_LIB_VERSION 1_58 */
#if BOOST_VERSION >= 107400 /* BOOST_LIB_VERSION 1_74 */
fs::copy_file(pathSrc.c_str(), pathDest, fs::copy_options::overwrite_existing);
#elif BOOST_VERSION >= 105800 /* BOOST_LIB_VERSION 1_58 */
fs::copy_file(pathSrc.c_str(), pathDest, fs::copy_option::overwrite_if_exists);
#else
std::ifstream src(pathSrc.c_str(), std::ios::binary | std::ios::in);
Expand Down