diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2002-06-14 12:47:43 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2002-06-14 12:47:43 +0000 |
| commit | 3ccb48ce9c48628c12c260d8114ed55e3f0dceb0 (patch) | |
| tree | 0a9dc195245506c5b7f5d8296169fc8e1256ccc2 | |
| parent | faa7d206ac9f0ec3373b3e9f9883634da3d97384 (diff) | |
| download | ATCD-3ccb48ce9c48628c12c260d8114ed55e3f0dceb0.tar.gz | |
ChangeLogTag: Fri Jun 14 07:46:50 2002 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp | 3 |
2 files changed, 11 insertions, 0 deletions
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 <elliott_c@ociweb.com> + + * 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 <ossama@uci.edu> * 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) |