From 58e60f6909d832bb6100e9a168f002a14d4214ef Mon Sep 17 00:00:00 2001
From: Ruslan Makhmatkhanov <rm@FreeBSD.org>
Date: Mon, 17 Jun 2013 11:42:41 +0000
Subject: - 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>
---
 devel/ice/files/patch-cpp-include-IceUtil-Shared.h | 72 ----------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 devel/ice/files/patch-cpp-include-IceUtil-Shared.h

(limited to 'devel/ice/files/patch-cpp-include-IceUtil-Shared.h')

diff --git a/devel/ice/files/patch-cpp-include-IceUtil-Shared.h b/devel/ice/files/patch-cpp-include-IceUtil-Shared.h
deleted file mode 100644
index 43a852a63d7e..000000000000
--- a/devel/ice/files/patch-cpp-include-IceUtil-Shared.h
+++ /dev/null
@@ -1,72 +0,0 @@
---- cpp.orig/include/IceUtil/Shared.h	2011-06-15 21:43:58.000000000 +0200
-+++ cpp/include/IceUtil/Shared.h	2012-09-10 11:43:58.000000000 +0200
-@@ -50,6 +50,11 @@
- //
- // A non thread-safe base class for reference-counted types.
- //
-+// IceUtil::SimpleSharedUnsafeDestructor
-+// =====================
-+//
-+// A non thread-safe base class for reference-counted types - destructor might throw.
-+//
- // IceUtil::Shared
- // ===============
- //
-@@ -109,6 +114,57 @@ private:
-     bool _noDelete;
- };
- 
-+class ICE_UTIL_API SimpleSharedUnsafeDestructor
-+{
-+public:
-+
-+    SimpleSharedUnsafeDestructor();
-+    SimpleSharedUnsafeDestructor(const SimpleSharedUnsafeDestructor&);
-+
-+    virtual ~SimpleSharedUnsafeDestructor() ICE_NOEXCEPT_FALSE
-+    {
-+    }
-+
-+    SimpleSharedUnsafeDestructor& operator=(const SimpleSharedUnsafeDestructor&)
-+    {
-+        return *this;
-+    }
-+
-+    void __incRef()
-+    {
-+        assert(_ref >= 0);
-+        ++_ref;
-+    }
-+
-+    void __decRef()
-+    {
-+        assert(_ref > 0);
-+        if(--_ref == 0)
-+        {
-+            if(!_noDelete)
-+            {
-+                _noDelete = true;
-+                delete this;
-+            }
-+        }
-+    }
-+
-+    int __getRef() const
-+    {
-+        return _ref;
-+    }
-+
-+    void __setNoDelete(bool b)
-+    {
-+        _noDelete = b;
-+    }
-+
-+private:
-+
-+    int _ref;
-+    bool _noDelete;
-+};
-+
- class ICE_UTIL_API Shared
- {
- public:
-- 
cgit v1.2.3