diff options
| -rwxr-xr-x | acprep | 4 | ||||
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | src/xact.cc | 11 | ||||
| -rwxr-xr-x | test/LedgerHarness.py | 2 | ||||
| -rwxr-xr-x | tools/proof | 2 |
5 files changed, 16 insertions, 5 deletions
@@ -236,7 +236,8 @@ class BoostInfo(object): 'libboost-python-dev', 'libboost-regex-dev', 'libboost-date-time-dev', - 'libboost-filesystem-dev' ] + 'libboost-filesystem-dev', + 'libboost-iostreams-dev' ] class CommandLineApp(object): "Base class for building command line applications." @@ -879,6 +880,7 @@ class PrepareBuild(CommandLineApp): 'libtool', 'autoconf', 'automake', + 'autopoint', 'zlib1g-dev', 'libbz2-dev', 'python-dev', diff --git a/lib/Makefile b/lib/Makefile index 10e63d5b..fa81bb76 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -5,7 +5,7 @@ STOW_ROOT = /usr/local/stow PRODUCTS = $(HOME)/Products -GCC_VERSION = 4.5 +GCC_VERSION = 4.6 BOOST_VERSION = 1_46_1 CC = gcc-mp-$(GCC_VERSION) diff --git a/src/xact.cc b/src/xact.cc index 35d61edd..1acbd0a4 100644 --- a/src/xact.cc +++ b/src/xact.cc @@ -325,9 +325,18 @@ bool xact_base_t::finalize() DEBUG("xact.finalize", "there was a null posting"); if (balance.is_balance()) { - bool first = true; const balance_t& bal(balance.as_balance()); + typedef std::map<string, amount_t> sorted_amounts_map; + sorted_amounts_map samp; foreach (const balance_t::amounts_map::value_type& pair, bal.amounts) { + std::pair<sorted_amounts_map::iterator, bool> result = + samp.insert(sorted_amounts_map::value_type(pair.first->mapping_key(), + pair.second)); + assert(result.second); + } + + bool first = true; + foreach (sorted_amounts_map::value_type& pair, samp) { if (first) { null_post->amount = pair.second.negated(); null_post->add_flags(POST_CALCULATED); diff --git a/test/LedgerHarness.py b/test/LedgerHarness.py index 44e4e61c..48d038ba 100755 --- a/test/LedgerHarness.py +++ b/test/LedgerHarness.py @@ -96,7 +96,7 @@ class LedgerHarness: line == "GuardMalloc: - Some buffer overruns may not be noticed.\n" or \ line == "GuardMalloc: - Applications using vector instructions (e.g., SSE or Altivec) may fail.\n" or \ line == "GuardMalloc: - Applications expecting word-aligned pointers may fail (such as Carbon applications)\n" or \ - line == "GuardMalloc: GuardMalloc version 18\n": + line.startswith("GuardMalloc: GuardMalloc version"): continue else: lines.append(line) diff --git a/tools/proof b/tools/proof index cd7b6636..0bd1e81f 100755 --- a/tools/proof +++ b/tools/proof @@ -14,7 +14,7 @@ fi rm -fr ~/Products/ledger-proof -time ./acprep --enable-doxygen --universal -j16 --warn proof 2>&1 | \ +time ./acprep --enable-doxygen --universal -j16 --gcc46 --warn proof 2>&1 | \ tee ~/Desktop/proof.log if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then |