diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2011-12-23 10:09:13 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2011-12-23 10:09:13 -0500 |
| commit | 961cf14ab3e0d16bcecdb64717accd088a0d00aa (patch) | |
| tree | 6c9181d3cda8398d424e4fd0507d225cc0e3a979 | |
| parent | 96c700f5e4b283e5479505d1e5f8fc9884dc1ff5 (diff) | |
| parent | 863238316144b0ae8d0208ed60d86d932475cfaa (diff) | |
| download | bitcoin-961cf14ab3e0d16bcecdb64717accd088a0d00aa.tar.xz | |
Merge branch '0.5.0.x' into 0.5.x
| -rw-r--r-- | contrib/gitian-descriptors/gitian.yml | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/util.h | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/contrib/gitian-descriptors/gitian.yml b/contrib/gitian-descriptors/gitian.yml index 47164b0afd..11ee4dc580 100644 --- a/contrib/gitian-descriptors/gitian.yml +++ b/contrib/gitian-descriptors/gitian.yml @@ -39,7 +39,7 @@ script: | cp $OUTDIR/src/COPYING $OUTDIR cd src sed 's/$(DEBUGFLAGS)//' -i makefile.unix - make -f makefile.unix STATIC=1 DEFS="-I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 USE_SSL=1 + make -f makefile.unix STATIC=1 OPENSSL_INCLUDE_PATH="$INSTDIR/include" OPENSSL_LIB_PATH="$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 USE_SSL=1 mkdir -p $OUTDIR/bin/$GBUILD_BITS install -s bitcoind $OUTDIR/bin/$GBUILD_BITS cd .. diff --git a/src/main.cpp b/src/main.cpp index a7871fcc16..f21af90473 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2828,7 +2828,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) // Transaction fee required depends on block size bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority)); - int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, true); + int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree); // Connecting shouldn't fail due to dependency on other memory pool transactions // because we're already processing them in order of dependency diff --git a/src/util.h b/src/util.h index 1ef0e6f15c..dcf060e3e8 100644 --- a/src/util.h +++ b/src/util.h @@ -296,6 +296,10 @@ public: // (secure_allocator<> is defined in serialize.h) typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString; +// This is exactly like std::string, but with a custom allocator. +// (secure_allocator<> is defined in serialize.h) +typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString; + |