DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Remove deprecated exception specification

Browse Source 
Warns on a newer compiler that these are deprecated in C++11
This commit is contained in:
Bjorn Hjortsberg
2017-07-20 13:58:39 +02:00
parent 4272a1e2b1
commit ecd04e914f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/leveldbwrapper.cpp
View File

@@ -13,7 +13,7 @@
#include <leveldb/filter_policy.h> #include <leveldb/filter_policy.h>
#include <memenv.h> #include <memenv.h>
void HandleError(const leveldb::Status& status) throw(leveldb_error) void HandleError(const leveldb::Status& status)
{ {
if (status.ok()) if (status.ok())
return; return;
@@ -81,7 +81,7 @@ CLevelDBWrapper::~CLevelDBWrapper()
options.env = NULL; options.env = NULL;
} }
bool CLevelDBWrapper::WriteBatch(CLevelDBBatch& batch, bool fSync) throw(leveldb_error) bool CLevelDBWrapper::WriteBatch(CLevelDBBatch& batch, bool fSync)
{ {
leveldb::Status status = pdb->Write(fSync ? syncoptions : writeoptions, &batch.batch); leveldb::Status status = pdb->Write(fSync ? syncoptions : writeoptions, &batch.batch);
HandleError(status); HandleError(status);

14
src/leveldbwrapper.h
View File

@@ -22,7 +22,7 @@ public:
leveldb_error(const std::string& msg) : std::runtime_error(msg) {} leveldb_error(const std::string& msg) : std::runtime_error(msg) {}
}; };
void HandleError(const leveldb::Status& status) throw(leveldb_error); void HandleError(const leveldb::Status& status);
/** Batch of changes queued to be written to a CLevelDBWrapper */ /** Batch of changes queued to be written to a CLevelDBWrapper */
class CLevelDBBatch class CLevelDBBatch
@@ -90,7 +90,7 @@ public:
~CLevelDBWrapper(); ~CLevelDBWrapper();
template <typename K, typename V> template <typename K, typename V>
bool Read(const K& key, V& value) const throw(leveldb_error) bool Read(const K& key, V& value) const
{ {
CDataStream ssKey(SER_DISK, CLIENT_VERSION); CDataStream ssKey(SER_DISK, CLIENT_VERSION);
ssKey.reserve(ssKey.GetSerializeSize(key)); ssKey.reserve(ssKey.GetSerializeSize(key));
@@ -115,7 +115,7 @@ public:
} }
template <typename K, typename V> template <typename K, typename V>
bool Write(const K& key, const V& value, bool fSync = false) throw(leveldb_error) bool Write(const K& key, const V& value, bool fSync = false)
{ {
CLevelDBBatch batch; CLevelDBBatch batch;
batch.Write(key, value); batch.Write(key, value);
@@ -123,7 +123,7 @@ public:
} }
template <typename K> template <typename K>
bool Exists(const K& key) const throw(leveldb_error) bool Exists(const K& key) const
{ {
CDataStream ssKey(SER_DISK, CLIENT_VERSION); CDataStream ssKey(SER_DISK, CLIENT_VERSION);
ssKey.reserve(ssKey.GetSerializeSize(key)); ssKey.reserve(ssKey.GetSerializeSize(key));
@@ -142,14 +142,14 @@ public:
} }
template <typename K> template <typename K>
bool Erase(const K& key, bool fSync = false) throw(leveldb_error) bool Erase(const K& key, bool fSync = false)
{ {
CLevelDBBatch batch; CLevelDBBatch batch;
batch.Erase(key); batch.Erase(key);
return WriteBatch(batch, fSync); return WriteBatch(batch, fSync);
} }
bool WriteBatch(CLevelDBBatch& batch, bool fSync = false) throw(leveldb_error); bool WriteBatch(CLevelDBBatch& batch, bool fSync = false);
// not available for LevelDB; provide for compatibility with BDB // not available for LevelDB; provide for compatibility with BDB
bool Flush() bool Flush()
@@ -157,7 +157,7 @@ public:
return true; return true;
} }
bool Sync() throw(leveldb_error) bool Sync()
{ {
CLevelDBBatch batch; CLevelDBBatch batch;
return WriteBatch(batch, true); return WriteBatch(batch, true);