diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-04-01 18:51:55 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-04-01 18:51:55 +0000 |
| commit | f58da0f73d90ca4d147142c26c776b0984e328b9 (patch) | |
| tree | 844c59eedecea9552e4ba28c43a0d9d0eaf6579a | |
| parent | 2cbb86c1a23e3f878a58b88412bb8be9ee8c592d (diff) | |
| download | ATCD-f58da0f73d90ca4d147142c26c776b0984e328b9.tar.gz | |
ChangeLogTag: Sat Apr 1 12:50:33 2000 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/tao/GIOP_Message_Lite.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/GIOP_Server_Request.cpp | 6 |
3 files changed, 17 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 34304886fd5..78f31db86dd 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Sat Apr 1 12:50:33 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/GIOP_Message_Lite.cpp: + * tao/GIOP_Server_Request.cpp: Fixed compiler errors in Minimum + CORBA build. + Sat Apr 1 12:09:56 2000 Balachandran Natarajan <bala@cs.wustl.edu> * tao/GIOP_Message_Lite.cpp (write_reply_header): Fixed a warning diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 8c1d78e389c..ba9b38d8dfe 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -9,6 +9,7 @@ #include "tao/operation_details.h" #include "tao/GIOP_Server_Request.h" #include "tao/GIOP_Message_Headers.h" +#include "tao/target_specification.h" #if !defined (__ACE_INLINE__) # include "tao/GIOP_Message_Lite.i" @@ -465,7 +466,7 @@ TAO_GIOP_Message_Lite:: output); // Write the service context list -#if defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 1) output << reply.service_context_notowned (); #else if (reply.params_ == 0) @@ -1243,7 +1244,10 @@ TAO_GIOP_Message_Lite:: reply_params.request_id_ = request_id; reply_params.svc_ctx_.length (0); reply_params.service_context_notowned (&reply_params.svc_ctx_); + +#if (TAO_HAS_MINIMUM_CORBA == 0) reply_params.params_ = 0; +#endif /*TAO_HAS_MINIMUM_CORBA*/ // A new try/catch block, but if something goes wrong now we have no // hope, just abort. diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp index 2fb6311a7fd..c160f0fe065 100644 --- a/TAO/tao/GIOP_Server_Request.cpp +++ b/TAO/tao/GIOP_Server_Request.cpp @@ -297,10 +297,12 @@ TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV) // invocation. So *theoratically* there should not be a problem. reply_params.request_id_ = this->request_id_; +#if (TAO_HAS_MINIMUM_CORBA == 0) if (this->lazy_evaluation_ == 0 || this->params_ == 0) reply_params.params_ = 0; else reply_params.params_ = this->params_; +#endif /*TAO_HAS_MINIMUM_CORBA */ // Pass in the service context reply_params.service_context_notowned (&this->service_info_); @@ -377,7 +379,11 @@ TAO_GIOP_ServerRequest::send_no_exception_reply (TAO_Transport *transport) // Construct our reply generator TAO_Pluggable_Reply_Params reply_params; reply_params.request_id_ = this->request_id_; + +#if (TAO_HAS_MINIMUM_CORBA == 0) reply_params.params_ = 0; +#endif /*TAO_HAS_MINIMUM_CORBA*/ + reply_params.svc_ctx_.length (0); // Pass in the service context |