diff options
| author | Boris Samorodov <bsam@FreeBSD.org> | 2012-09-23 14:45:33 +0000 |
|---|---|---|
| committer | Boris Samorodov <bsam@FreeBSD.org> | 2012-09-23 14:45:33 +0000 |
| commit | c1436fa4e5e34530cd4ca97f9d1796dd47f64d19 (patch) | |
| tree | 53e80749449d5d0989720db9cd5dbd8f5215fa9a /devel/ice/files/patch-cpp-src-Freeze-MapDb.cpp | |
| parent | - Update 96.43.xx legacy driver to version 96.43.23, which brings support (diff) | |
Changes from the PR:
. fix built using Clang in C++11 mode and libc++ (-std=c++11
-stdlib=libc++);
. incorporate a patch that fixes an assert bug in IceStrom;
. adopt new-style options;
While I'm here:
. adopt new-style headers;
. remove indefinite article form COMMENT;
. remove library versions from LIB_DEPENDS.
PR: ports/171643
Submitted by: Michael Gmelin <freebsd@grem.de> (maintainer)
Notes
Notes:
svn path=/head/; revision=304742
Diffstat (limited to 'devel/ice/files/patch-cpp-src-Freeze-MapDb.cpp')
| -rw-r--r-- | devel/ice/files/patch-cpp-src-Freeze-MapDb.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/devel/ice/files/patch-cpp-src-Freeze-MapDb.cpp b/devel/ice/files/patch-cpp-src-Freeze-MapDb.cpp index d81ab18862c3..a03dce42e20c 100644 --- a/devel/ice/files/patch-cpp-src-Freeze-MapDb.cpp +++ b/devel/ice/files/patch-cpp-src-Freeze-MapDb.cpp @@ -1,5 +1,19 @@ --- cpp.orig/src/Freeze/MapDb.cpp 2011-06-15 21:43:58.000000000 +0200 -+++ cpp/src/Freeze/MapDb.cpp 2012-03-04 20:14:52.000000000 +0100 ++++ cpp/src/Freeze/MapDb.cpp 2012-09-10 11:43:58.000000000 +0200 +@@ -72,7 +72,13 @@ Freeze::MapDb::~MapDb() + } + catch(const ::DbException& dx) + { ++#if defined(ICE_DESTRUCTORS_DONT_THROW_BY_DEFAULT) ++ Error out(_communicator->getLogger()); ++ out << "DbException while closing database " << _dbName << ": " ++ << dx.what(); ++#else + throw DatabaseException(__FILE__, __LINE__, dx.what()); ++#endif + } + } + } @@ -229,7 +229,11 @@ #ifndef NDEBUG bool inserted = |