From 3ccb48ce9c48628c12c260d8114ed55e3f0dceb0 Mon Sep 17 00:00:00 2001 From: elliott_c Date: Fri, 14 Jun 2002 12:47:43 +0000 Subject: ChangeLogTag: Fri Jun 14 07:46:50 2002 Chad Elliott --- TAO/ChangeLogs/ChangeLog-02a | 8 ++++++++ TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp | 3 +++ 2 files changed, 11 insertions(+) diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 211f9ab08b6..8ef6df11537 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Fri Jun 14 07:46:50 2002 Chad Elliott + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp: + + Do not initialize the trust_ data member when building + for VxWorks and QNX. The compilers for these OS's do + not accept this. + Thu Jun 13 10:50:37 2002 Ossama Othman * orbsvcs/orbsvcs/CosLoadBalancing.idl: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index 1f6f4870994..869c96bb41c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -22,7 +22,10 @@ TAO_SSLIOP_Endpoint::TAO_SSLIOP_Endpoint (const SSLIOP::SSL *ssl_component, iiop_endpoint_ (iiop_endp), destroy_iiop_endpoint_ (0), qop_ (Security::SecQOPIntegrityAndConfidentiality), +#if !defined (VXWORKS) && !defined (__QNX__) + // Some compilers don't like the initialization trust_ (), +#endif /* !VXWORKS && !__QNX__ */ credentials_ () { if (ssl_component != 0) -- cgit v1.2.1