additional fixes

zeroc-ice · May 7, 2024 · d348547 · d348547
1 parent d8d8c89
commit d348547
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/cpp/src/Ice/ios/StreamEndpointI.h b/cpp/src/Ice/ios/StreamEndpointI.h
@@ -14,7 +14,7 @@
 #    include "../ProtocolInstance.h"
 #    include "../WSEndpoint.h"
 #    include "Ice/InstanceF.h"
-#    include "Ice/ServerAuthenticationOptions.h"
+#    include "Ice/SSL/ServerAuthenticationOptions.h"
 #    include "Ice/UniqueRef.h"
 
 #    include <CFNetwork/CFNetwork.h>

diff --git a/matlab/lib/+Ice/SecurityException.m b/matlab/lib/+Ice/SecurityException.m
@@ -1,6 +1,6 @@
 % SecurityException   Summary of SecurityException
 %
-% This exception indicates a failure in a security subsystem, such as the IceSSL plug-in.
+% This exception indicates a failure in a security subsystem, such as the SSL transport.
 %
 % SecurityException Properties:
 %   reason - The reason for the failure.

diff --git a/matlab/src/Connection.cpp b/matlab/src/Connection.cpp
@@ -72,7 +72,7 @@ namespace
 
         string type = "other";
 
-        shared_ptr<Ice::IPConnectionInfo> ipInfo = dynamic_pointer_cast<Ice::IPConnectionInfo>(info);
+        auto ipInfo = dynamic_pointer_cast<Ice::IPConnectionInfo>(info);
         if (ipInfo)
         {
             type = "ip";
@@ -82,7 +82,7 @@ namespace
             mxSetFieldByNumber(r, 0, Field::RemotePort, createInt(ipInfo->remotePort));
         }
 
-        shared_ptr<Ice::UDPConnectionInfo> udpInfo = dynamic_pointer_cast<Ice::UDPConnectionInfo>(info);
+        auto udpInfo = dynamic_pointer_cast<Ice::UDPConnectionInfo>(info);
         if (udpInfo)
         {
             type = "udp";
@@ -92,22 +92,22 @@ namespace
             mxSetFieldByNumber(r, 0, Field::SndSize, createInt(udpInfo->sndSize));
         }
 
-        shared_ptr<Ice::TCPConnectionInfo> tcpInfo = dynamic_pointer_cast<Ice::TCPConnectionInfo>(info);
+        auto tcpInfo = dynamic_pointer_cast<Ice::TCPConnectionInfo>(info);
         if (tcpInfo)
         {
             type = "tcp";
             mxSetFieldByNumber(r, 0, Field::RcvSize, createInt(tcpInfo->rcvSize));
             mxSetFieldByNumber(r, 0, Field::SndSize, createInt(tcpInfo->sndSize));
         }
 
-        shared_ptr<Ice::WSConnectionInfo> wsInfo = dynamic_pointer_cast<Ice::WSConnectionInfo>(info);
+        auto wsInfo = dynamic_pointer_cast<Ice::WSConnectionInfo>(info);
         if (wsInfo)
         {
             type = "ws";
             mxSetFieldByNumber(r, 0, Field::Headers, createStringMap(wsInfo->headers));
         }
 
-        shared_ptr<IceSSL::ConnectionInfo> sslInfo = dynamic_pointer_cast<IceSSL::ConnectionInfo>(info);
+        auto sslInfo = dynamic_pointer_cast<Ice::SSL::ConnectionInfo>(info);
         if (sslInfo)
         {
             type = "ssl";

diff --git a/matlab/src/Endpoint.cpp b/matlab/src/Endpoint.cpp
@@ -111,7 +111,7 @@ namespace
             mxSetFieldByNumber(r, 0, Field::Resource, createStringFromUTF8(wsInfo->resource));
         }
 
-        if (dynamic_pointer_cast<IceSSL::EndpointInfo>(info))
+        if (dynamic_pointer_cast<Ice::SSL::EndpointInfo>(info))
         {
             mxSetFieldByNumber(r, 0, Field::InfoType, createInt(Ice::SSLEndpointType));
         }

diff --git a/matlab/src/Util.cpp b/matlab/src/Util.cpp
@@ -614,7 +614,7 @@ IceMatlab::createByteList(const vector<byte>& bytes)
 }
 
 mxArray*
-IceMatlab::createCertificateList(const vector<IceSSL::CertificatePtr>& certs)
+IceMatlab::createCertificateList(const vector<Ice::SSL::CertificatePtr>& certs)
 {
     auto r = mxCreateCellMatrix(1, static_cast<int>(certs.size()));
     mwIndex i = 0;

diff --git a/matlab/src/Util.h b/matlab/src/Util.h
@@ -41,7 +41,7 @@ namespace IceMatlab
     void getStringList(mxArray*, std::vector<std::string>&);
     mxArray* createByteArray(const std::byte*, const std::byte*);
     mxArray* createByteList(const std::vector<std::byte>&);
-    mxArray* createCertificateList(const std::vector<IceSSL::CertificatePtr>&);
+    mxArray* createCertificateList(const std::vector<Ice::SSL::CertificatePtr>&);
 
     std::string idToClass(const std::string&);