changeset 29659:8cf6c8639b4e

build: fix darwin build
author Braydon Fuller <courier@braydon.com>
date Tue, 12 Apr 2016 23:25:55 -0400
parents 0757de524b85
children 5bb55cc1a115
files src/addressindex.h src/txdb.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/addressindex.h	Tue Apr 12 20:33:18 2016 -0400
+++ b/src/addressindex.h	Tue Apr 12 23:25:55 2016 -0400
@@ -57,7 +57,7 @@
 
 struct CMempoolAddressDeltaKeyCompare
 {
-    bool operator()(const CMempoolAddressDeltaKey& a, const CMempoolAddressDeltaKey& b) {
+    bool operator()(const CMempoolAddressDeltaKey& a, const CMempoolAddressDeltaKey& b) const {
         if (a.type == b.type) {
             if (a.addressBytes == b.addressBytes) {
                 if (a.txhash == b.txhash) {
--- a/src/txdb.cpp	Tue Apr 12 20:33:18 2016 -0400
+++ b/src/txdb.cpp	Tue Apr 12 23:25:55 2016 -0400
@@ -271,7 +271,7 @@
 
 bool CBlockTreeDB::WriteTimestampIndex(const CTimestampIndexKey &timestampIndex) {
     CDBBatch batch(&GetObfuscateKey());
-    batch.Write(make_pair(DB_TIMESTAMPINDEX, timestampIndex), NULL);
+    batch.Write(make_pair(DB_TIMESTAMPINDEX, timestampIndex), 0);
     return WriteBatch(batch);
 }