Merge pull request #1 from AmirAbrams/patch-1

list_of -> boost::assign::list_of
CryptoDJ · Nov 12, 2016 · a293a1f · a293a1f
2 parents 83810d0 + d3efaf7
commit a293a1f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -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));
 

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -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