From 127e3109f98c1b821a9534251bb1b18b222a1dfd Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Thu, 26 Sep 2024 17:29:43 +0200
Subject: [PATCH] Fix C++ based mappings

---
 matlab/src/ObjectPrx.cpp       | 6 ++++--
 php/src/Proxy.cpp              | 7 ++++---
 python/modules/IcePy/Proxy.cpp | 8 ++++----
 ruby/src/IceRuby/Proxy.cpp     | 8 ++++----
 swift/src/IceImpl/ObjectPrx.mm | 4 ++--
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/matlab/src/ObjectPrx.cpp b/matlab/src/ObjectPrx.cpp
index 45e3cad7292..1892d1b9523 100644
--- a/matlab/src/ObjectPrx.cpp
+++ b/matlab/src/ObjectPrx.cpp
@@ -542,7 +542,8 @@ extern "C"
 
     mxArray* Ice_ObjectPrx_ice_getLocatorCacheTimeout(void* self)
     {
-        return createResultValue(createInt(restoreProxy(self)->ice_getLocatorCacheTimeout()));
+        chrono::seconds timeout = restoreProxy(self)->ice_getLocatorCacheTimeout();
+        return createResultValue(createInt(chrono::duration_cast<chrono::duration<int32_t>>(timeout).count()));
     }
 
     mxArray* Ice_ObjectPrx_ice_locatorCacheTimeout(void* self, void** r, int t)
@@ -562,7 +563,8 @@ extern "C"
 
     mxArray* Ice_ObjectPrx_ice_getInvocationTimeout(void* self)
     {
-        return createResultValue(createInt(restoreProxy(self)->ice_getInvocationTimeout()));
+        chrono::milliseconds timeout = restoreProxy(self)->ice_getInvocationTimeout();
+        return createResultValue(createInt(chrono::duration_cast<chrono::duration<int32_t>>(timeout).count()));
     }
 
     mxArray* Ice_ObjectPrx_ice_invocationTimeout(void* self, void** r, int t)
diff --git a/php/src/Proxy.cpp b/php/src/Proxy.cpp
index 1d0f8815656..bba3c4a97a4 100644
--- a/php/src/Proxy.cpp
+++ b/php/src/Proxy.cpp
@@ -420,8 +420,8 @@ ZEND_METHOD(Ice_ObjectPrx, ice_getLocatorCacheTimeout)
 
     try
     {
-        int32_t timeout = _this->proxy->ice_getLocatorCacheTimeout();
-        ZVAL_LONG(return_value, static_cast<long>(timeout));
+        chrono::seconds timeout = _this->proxy->ice_getLocatorCacheTimeout();
+        ZVAL_LONG(return_value, chrono::duration_cast<chrono::duration<long>>(timeout).count());
     }
     catch (...)
     {
@@ -1253,7 +1253,8 @@ ZEND_METHOD(Ice_ObjectPrx, ice_getInvocationTimeout)
 
     try
     {
-        ZVAL_LONG(return_value, static_cast<long>(_this->proxy->ice_getInvocationTimeout()));
+        chrono::milliseconds timeout = _this->proxy->ice_getInvocationTimeout();
+        ZVAL_LONG(return_value, chrono::duration_cast<chrono::duration<long>>(timeout).count());
     }
     catch (...)
     {
diff --git a/python/modules/IcePy/Proxy.cpp b/python/modules/IcePy/Proxy.cpp
index 3705829d991..bdb9e14035b 100644
--- a/python/modules/IcePy/Proxy.cpp
+++ b/python/modules/IcePy/Proxy.cpp
@@ -611,8 +611,8 @@ proxyIceGetLocatorCacheTimeout(ProxyObject* self, PyObject* /*args*/)
 
     try
     {
-        int32_t timeout = (*self->proxy)->ice_getLocatorCacheTimeout();
-        return PyLong_FromLong(timeout);
+        chrono::seconds timeout = (*self->proxy)->ice_getLocatorCacheTimeout();
+        return PyLong_FromLong(chrono::duration_cast<chrono::duration<int32_t>>(timeout).count());
     }
     catch (...)
     {
@@ -628,8 +628,8 @@ proxyIceGetInvocationTimeout(ProxyObject* self, PyObject* /*args*/)
 
     try
     {
-        int32_t timeout = (*self->proxy)->ice_getInvocationTimeout();
-        return PyLong_FromLong(timeout);
+        chrono::milliseconds timeout = (*self->proxy)->ice_getInvocationTimeout();
+        return PyLong_FromLong(chrono::duration_cast<chrono::duration<int32_t>>(timeout).count());
     }
     catch (...)
     {
diff --git a/ruby/src/IceRuby/Proxy.cpp b/ruby/src/IceRuby/Proxy.cpp
index b7b8caf5810..6d8ff678d8a 100644
--- a/ruby/src/IceRuby/Proxy.cpp
+++ b/ruby/src/IceRuby/Proxy.cpp
@@ -366,8 +366,8 @@ IceRuby_ObjectPrx_ice_getLocatorCacheTimeout(VALUE self)
     ICE_RUBY_TRY
     {
         Ice::ObjectPrx p = getProxy(self);
-        int32_t t = p->ice_getLocatorCacheTimeout();
-        return INT2FIX(t);
+        chrono::seconds timeout = p->ice_getLocatorCacheTimeout();
+        return INT2FIX(chrono::duration_cast<chrono::duration<int32_t>>(timeout).count());
     }
     ICE_RUBY_CATCH
     return Qnil;
@@ -379,8 +379,8 @@ IceRuby_ObjectPrx_ice_getInvocationTimeout(VALUE self)
     ICE_RUBY_TRY
     {
         Ice::ObjectPrx p = getProxy(self);
-        int32_t t = p->ice_getInvocationTimeout();
-        return INT2FIX(t);
+        chrono::milliseconds timeout = p->ice_getInvocationTimeout();
+        return INT2FIX(chrono::duration_cast<chrono::duration<int32_t>>(timeout).count());
     }
     ICE_RUBY_CATCH
     return Qnil;
diff --git a/swift/src/IceImpl/ObjectPrx.mm b/swift/src/IceImpl/ObjectPrx.mm
index 182b80cee82..2e3c7e84994 100644
--- a/swift/src/IceImpl/ObjectPrx.mm
+++ b/swift/src/IceImpl/ObjectPrx.mm
@@ -125,7 +125,7 @@ - (instancetype)ice_endpoints:(NSArray<ICEEndpoint*>*)endpoints error:(NSError**
 
 - (int32_t)ice_getLocatorCacheTimeout
 {
-    return _prx->ice_getLocatorCacheTimeout();
+    return std::chrono::duration_cast<std::chrono::duration<int32_t>>(_prx->ice_getLocatorCacheTimeout()).count();
 }
 
 - (instancetype)ice_locatorCacheTimeout:(int32_t)timeout error:(NSError**)error
@@ -144,7 +144,7 @@ - (instancetype)ice_locatorCacheTimeout:(int32_t)timeout error:(NSError**)error
 
 - (int32_t)ice_getInvocationTimeout
 {
-    return _prx->ice_getInvocationTimeout();
+    return std::chrono::duration_cast<std::chrono::duration<int32_t>>(_prx->ice_getInvocationTimeout()).count();
 }
 
 - (instancetype)ice_invocationTimeout:(int32_t)timeout error:(NSError**)error