From f57ee84f249b28dd9034664bcb36a66042e1baba Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 10 Feb 2019 15:05:23 +0000
Subject: Move patches not required by latest Ice
---
dev-libs/Ice-3.7.1/missing-throw.patch | 27 +++++++++++++++++++++++++++
dev-libs/Ice-3.7.1/remove-memset.patch | 34 ++++++++++++++++++++++++++++++++++
dev-libs/Ice/missing-throw.patch | 27 ---------------------------
dev-libs/Ice/remove-memset.patch | 34 ----------------------------------
4 files changed, 61 insertions(+), 61 deletions(-)
create mode 100644 dev-libs/Ice-3.7.1/missing-throw.patch
create mode 100644 dev-libs/Ice-3.7.1/remove-memset.patch
delete mode 100644 dev-libs/Ice/missing-throw.patch
delete mode 100644 dev-libs/Ice/remove-memset.patch
diff --git a/dev-libs/Ice-3.7.1/missing-throw.patch b/dev-libs/Ice-3.7.1/missing-throw.patch
new file mode 100644
index 0000000..6f5fb7b
--- /dev/null
+++ b/dev-libs/Ice-3.7.1/missing-throw.patch
@@ -0,0 +1,27 @@
+From 8b221cc5a17ba64836a687e17cbbf46d9ac8b359 Mon Sep 17 00:00:00 2001
+From: Jose <jose@zeroc.com>
+Date: Mon, 4 Jun 2018 20:45:04 +0000
+Subject: Missing throw statement
+
+---
+ cpp/src/IceGrid/Database.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'cpp/src/IceGrid/Database.cpp')
+
+diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp
+index 60f9556435..985631371a 100644
+--- a/cpp/src/IceGrid/Database.cpp
++++ b/cpp/src/IceGrid/Database.cpp
+@@ -1628,7 +1628,7 @@ Database::updateObject(const Ice::ObjectPrx& proxy)
+
+ if(!_objects.get(txn, id, info))
+ {
+- ObjectNotRegisteredException(id);
++ throw ObjectNotRegisteredException(id);
+ }
+ info.proxy = proxy;
+ addObject(txn, info, false);
+--
+cgit v1.2.1
+
diff --git a/dev-libs/Ice-3.7.1/remove-memset.patch b/dev-libs/Ice-3.7.1/remove-memset.patch
new file mode 100644
index 0000000..c325311
--- /dev/null
+++ b/dev-libs/Ice-3.7.1/remove-memset.patch
@@ -0,0 +1,34 @@
+From a6a4981616b669432ff7b588179d6e93694d9e3f Mon Sep 17 00:00:00 2001
+From: Jose <jose@zeroc.com>
+Date: Mon, 4 Jun 2018 20:46:16 +0000
+Subject: Remove unnecessary memset
+
+---
+ cpp/src/Ice/NetworkProxy.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+(limited to 'cpp/src/Ice/NetworkProxy.cpp')
+
+diff --git a/cpp/src/Ice/NetworkProxy.cpp b/cpp/src/Ice/NetworkProxy.cpp
+index c2630b380d..4c974e0465 100644
+--- a/cpp/src/Ice/NetworkProxy.cpp
++++ b/cpp/src/Ice/NetworkProxy.cpp
+@@ -81,7 +81,6 @@ private:
+ SOCKSNetworkProxy::SOCKSNetworkProxy(const string& host, int port) : _host(host), _port(port)
+ {
+ assert(!host.empty());
+- memset(&_address, 0, sizeof(_address));
+ }
+
+ SOCKSNetworkProxy::SOCKSNetworkProxy(const Address& addr) : _port(0), _address(addr)
+@@ -194,7 +193,6 @@ HTTPNetworkProxy::HTTPNetworkProxy(const string& host, int port) :
+ _host(host), _port(port), _protocol(EnableBoth)
+ {
+ assert(!host.empty());
+- memset(&_address, 0, sizeof(_address));
+ }
+
+ HTTPNetworkProxy::HTTPNetworkProxy(const Address& addr, ProtocolSupport protocol) :
+--
+cgit v1.2.1
+
diff --git a/dev-libs/Ice/missing-throw.patch b/dev-libs/Ice/missing-throw.patch
deleted file mode 100644
index 6f5fb7b..0000000
--- a/dev-libs/Ice/missing-throw.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8b221cc5a17ba64836a687e17cbbf46d9ac8b359 Mon Sep 17 00:00:00 2001
-From: Jose <jose@zeroc.com>
-Date: Mon, 4 Jun 2018 20:45:04 +0000
-Subject: Missing throw statement
-
----
- cpp/src/IceGrid/Database.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'cpp/src/IceGrid/Database.cpp')
-
-diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp
-index 60f9556435..985631371a 100644
---- a/cpp/src/IceGrid/Database.cpp
-+++ b/cpp/src/IceGrid/Database.cpp
-@@ -1628,7 +1628,7 @@ Database::updateObject(const Ice::ObjectPrx& proxy)
-
- if(!_objects.get(txn, id, info))
- {
-- ObjectNotRegisteredException(id);
-+ throw ObjectNotRegisteredException(id);
- }
- info.proxy = proxy;
- addObject(txn, info, false);
---
-cgit v1.2.1
-
diff --git a/dev-libs/Ice/remove-memset.patch b/dev-libs/Ice/remove-memset.patch
deleted file mode 100644
index c325311..0000000
--- a/dev-libs/Ice/remove-memset.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a6a4981616b669432ff7b588179d6e93694d9e3f Mon Sep 17 00:00:00 2001
-From: Jose <jose@zeroc.com>
-Date: Mon, 4 Jun 2018 20:46:16 +0000
-Subject: Remove unnecessary memset
-
----
- cpp/src/Ice/NetworkProxy.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-(limited to 'cpp/src/Ice/NetworkProxy.cpp')
-
-diff --git a/cpp/src/Ice/NetworkProxy.cpp b/cpp/src/Ice/NetworkProxy.cpp
-index c2630b380d..4c974e0465 100644
---- a/cpp/src/Ice/NetworkProxy.cpp
-+++ b/cpp/src/Ice/NetworkProxy.cpp
-@@ -81,7 +81,6 @@ private:
- SOCKSNetworkProxy::SOCKSNetworkProxy(const string& host, int port) : _host(host), _port(port)
- {
- assert(!host.empty());
-- memset(&_address, 0, sizeof(_address));
- }
-
- SOCKSNetworkProxy::SOCKSNetworkProxy(const Address& addr) : _port(0), _address(addr)
-@@ -194,7 +193,6 @@ HTTPNetworkProxy::HTTPNetworkProxy(const string& host, int port) :
- _host(host), _port(port), _protocol(EnableBoth)
- {
- assert(!host.empty());
-- memset(&_address, 0, sizeof(_address));
- }
-
- HTTPNetworkProxy::HTTPNetworkProxy(const Address& addr, ProtocolSupport protocol) :
---
-cgit v1.2.1
-
--
cgit v1.2.3