Berkeley DB v6 compatibility fix

Alexey Vesnin · web-flow · commit 323a5fe06af4 · 2016-08-30T09:00:55.000+03:00
Fixes building error looking like this:
CXX wallet/libbitcoin_wallet_a-db.o
wallet/db.cpp: In member function ‘void CDBEnv::EnvShutdown()’:
wallet/db.cpp:46:16: error: call of overloaded ‘DbEnv(int)’ is ambiguous
DbEnv(0).remove(strPath.c_str(), 0);
^
wallet/db.cpp:46:16: note: candidates are:
In file included from wallet/db.h:21:0,
from wallet/db.cpp:6:
/usr/include/db_cxx.h:916:2: note: DbEnv::DbEnv(const DbEnv&amp;)
DbEnv(const DbEnv &amp;);
^
/usr/include/db_cxx.h:518:2: note: DbEnv::DbEnv(DB_ENV)
DbEnv(DB_ENV *dbenv);
^
/usr/include/db_cxx.h:516:2: note: DbEnv::DbEnv(u_int32_t)
DbEnv(u_int32_t flags);
^
Makefile:5780: recipe for target 'wallet/libbitcoin_wallet_a-db.o' failed
make[2]: ** [wallet/libbitcoin_wallet_a-db.o] Error 1
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -43,7 +43,7 @@ void CDBEnv::EnvShutdown()
     if (ret != 0)
         LogPrintf("CDBEnv::EnvShutdown: Error %d shutting down database environment: %s\n", ret, DbEnv::strerror(ret));
     if (!fMockDb)
-        DbEnv(0).remove(strPath.c_str(), 0);
+        DbEnv((u_int32_t)0).remove(strPath.c_str(), 0);
 }
 
 void CDBEnv::Reset()

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void CDBEnv::EnvShutdown()`
`43`	`43`	`if (ret != 0)`
`44`	`44`	`LogPrintf("CDBEnv::EnvShutdown: Error %d shutting down database environment: %s\n", ret, DbEnv::strerror(ret));`
`45`	`45`	`if (!fMockDb)`
`46`		`- DbEnv(0).remove(strPath.c_str(), 0);`
	`46`	`+ DbEnv((u_int32_t)0).remove(strPath.c_str(), 0);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`void CDBEnv::Reset()`