diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-09-03 14:42:10 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-03 14:42:10 +0200 |
commit | c82f0a59f136fbeb8b66eabdc29e0e18b64d6717 (patch) | |
tree | 585ce7bf387885677d020463e446424598a34093 /cpp/src/IceDB/IceDB.cpp | |
parent | Merge branch 'encoding11' into mx (diff) | |
parent | changing data member mapping to use Ice.Optional in C# (diff) | |
download | ice-c82f0a59f136fbeb8b66eabdc29e0e18b64d6717.tar.bz2 ice-c82f0a59f136fbeb8b66eabdc29e0e18b64d6717.tar.xz ice-c82f0a59f136fbeb8b66eabdc29e0e18b64d6717.zip |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/IceGrid/Database.cpp
Diffstat (limited to 'cpp/src/IceDB/IceDB.cpp')
-rw-r--r-- | cpp/src/IceDB/IceDB.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/cpp/src/IceDB/IceDB.cpp b/cpp/src/IceDB/IceDB.cpp index 015699cacf6..ff012579483 100644 --- a/cpp/src/IceDB/IceDB.cpp +++ b/cpp/src/IceDB/IceDB.cpp @@ -16,18 +16,34 @@ using namespace IceDB; using namespace std; + +IceDB::DatabaseException::DatabaseException(const char* file, int line) : + IceUtil::Exception(file, line) +{ +} + string DatabaseException::ice_name() const { return "IceDB::DatabaseException"; } +DeadlockException::DeadlockException(const char* file, int line) : + DatabaseException(file, line) +{ +} + string DeadlockException::ice_name() const { return "IceDB::DeadlockException"; } +NotFoundException::NotFoundException(const char* file, int line) : +DatabaseException(file, line) +{ +} + string NotFoundException::ice_name() const { |