Skip to content

list_of -> boost::assign::list_of #1

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

Merged
AmirAbrams merged 3 commits into from
Nov 12, 2016
Merged

list_of -> boost::assign::list_of #1

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
73c1775
list_of -> boost::assign::list_of
AmirAbrams Nov 12, 2016
e2bb245
Bump Version
AmirAbrams Nov 12, 2016
d3efaf7
[Params] Add convert_to_container for list_of
AmirAbrams Nov 12, 2016
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
10 changes: 5 additions & 5 deletions src/chainparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ class CMainParams : public CChainParams {
vSeeds.push_back(CDNSSeedData("bitcointx.io", "btxseed6.bitcointx.io"));
vSeeds.push_back(CDNSSeedData("bitcointx.io", "btxseed7.bitcointx.io"));

base58Prefixes[PUBKEY_ADDRESS] = list_of(35);
base58Prefixes[SCRIPT_ADDRESS] = list_of(85);
base58Prefixes[SECRET_KEY] = list_of(153);
base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x88)(0xB2)(0x1E);
base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x88)(0xAD)(0xE4);
base58Prefixes[PUBKEY_ADDRESS] = boost::assign::list_of(35);
base58Prefixes[SCRIPT_ADDRESS] = boost::assign::list_of(85);
base58Prefixes[SECRET_KEY] = boost::assign::list_of(153);
base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x88)(0xB2)(0x1E).convert_to_container<std::vector<unsigned char> >();
base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x88)(0xAD)(0xE4).convert_to_container<std::vector<unsigned char> >();

convertSeed6(vFixedSeeds, pnSeed6_main, ARRAYLEN(pnSeed6_main));

Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 2
#define CLIENT_VERSION_MINOR 1
#define CLIENT_VERSION_REVISION 5
#define CLIENT_VERSION_REVISION 6
#define CLIENT_VERSION_BUILD 0

// Set to true for release, false for prerelease or test build
Expand Down