diff options
author | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2013-06-17 11:42:41 +0000 |
---|---|---|
committer | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2013-06-17 11:42:41 +0000 |
commit | 58e60f6909d832bb6100e9a168f002a14d4214ef (patch) | |
tree | 3676c05fa6760a824faa9ecb99d28794fb4563c8 /devel/ice/files/patch-cpp-src-Freeze-MapI.cpp | |
parent | Update dialog4ports to 0.1.5 (diff) |
- update to 3.5.0
- add license (GPLv2)
- switch to bdb 5
- mark broken on 10.x for the time being (as it was discussed on ports@ ML)
- remove patches, applied upstream
This version of Ice brings many new features, e.g.
- New encoding version
- Metrics facility
- Optional data members and parameters
- Compact encoding for classes and exceptions
- Compact type IDs
- Preserved slices
- Custom enumerator values
- C++11 lambda functions
- Remote Update of Server Properties
- IPv6 now enabled by default
- Python 3 support
- Use Berkley DB 5
See http://doc.zeroc.com/display/Ice/Release+Notes for details.
PR: 179233
Submitted by: Michael Gmelin <freebsd@grem.de> (maintainer)
Tested by: Jaret Bartsch <jaretbartsch@yahoo.ca>
Notes
Notes:
svn path=/head/; revision=321096
Diffstat (limited to 'devel/ice/files/patch-cpp-src-Freeze-MapI.cpp')
-rw-r--r-- | devel/ice/files/patch-cpp-src-Freeze-MapI.cpp | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/devel/ice/files/patch-cpp-src-Freeze-MapI.cpp b/devel/ice/files/patch-cpp-src-Freeze-MapI.cpp deleted file mode 100644 index 029abbdbbe51..000000000000 --- a/devel/ice/files/patch-cpp-src-Freeze-MapI.cpp +++ /dev/null @@ -1,41 +0,0 @@ ---- cpp.orig/src/Freeze/MapI.cpp 2011-06-15 21:43:58.000000000 +0200 -+++ cpp/src/Freeze/MapI.cpp 2012-03-04 20:14:52.000000000 +0100 -@@ -749,8 +749,11 @@ - - try - { -+#ifndef NDEBUG - int err; -- err = _dbc->put(&dbKey, &dbValue, DB_CURRENT); -+ err = -+#endif -+ _dbc->put(&dbKey, &dbValue, DB_CURRENT); - assert(err == 0); - } - catch(const ::DbDeadlockException& dx) -@@ -1023,7 +1026,11 @@ - #ifndef NDEBUG - bool inserted = - #endif -- _indices.insert(IndexMap::value_type(indexBase->name(), indexBase)).second; -+ _indices.insert(IndexMap::value_type(indexBase->name(), indexBase)) -+#ifndef NDEBUG -+ .second -+#endif -+ ; - assert(inserted); - indexBase->_map = this; - } -@@ -1360,8 +1367,11 @@ - try - { - u_int32_t count; -+#ifndef NDEBUG - int err; -- err = _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT); -+ err = -+#endif -+ _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT); - assert(err == 0); - break; - } |