diff options
| author | Angelo Corsaro <angelo@icorsaro.net> | 2000-10-08 17:34:09 +0000 |
|---|---|---|
| committer | Angelo Corsaro <angelo@icorsaro.net> | 2000-10-08 17:34:09 +0000 |
| commit | 8e586c5170ccd4903aebf62705f7ed59ca3960c4 (patch) | |
| tree | 294176d65a7dc97636664fa3dfdcce6422ff9d17 | |
| parent | f282a6731b58b7305ada968d14903839e50153fa (diff) | |
| download | ATCD-8e586c5170ccd4903aebf62705f7ed59ca3960c4.tar.gz | |
Sun Oct 08 12:19:15 2000 Angelo Corsaro <corsaro@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 11 | ||||
| -rw-r--r-- | TAO/tao/Object.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Makefile.bor | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index fb59dce2e08..57d15a7d3d6 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,14 @@ +Sun Oct 08 12:19:15 2000 Angelo Corsaro <corsaro@cs.wustl.edu> + + * tao/Object.cpp: + + Fixed _tao_QueryInterface to return the correct + value instead of 0. + + * tao/PortableServer/Makefile.bor: + + Removed typo. + Sat Oct 07 16:00:45 2000 Nanbor Wang <nanbor@cs.wustl.edu> * tao/corbafwd.h: Changed CORBA::is_nil (CORBA::Object_ptr) to diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 54693e5090a..c5d630bf77b 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -208,7 +208,7 @@ CORBA::Object::_tao_QueryInterface (ptr_arith_t type) if (retv) this->_add_ref (); - return 0; + return retv; } void @@ -217,7 +217,8 @@ CORBA::Object::_proxy_broker (TAO_Object_Proxy_Broker *proxy_broker) this->proxy_broker_ = proxy_broker; } -TAO_Object_Proxy_Broker *CORBA::Object::_proxy_broker (void) +TAO_Object_Proxy_Broker * +CORBA::Object::_proxy_broker (void) { return this->proxy_broker_; } diff --git a/TAO/tao/PortableServer/Makefile.bor b/TAO/tao/PortableServer/Makefile.bor index 7d0a7f2c18e..e4dda686de4 100644 --- a/TAO/tao/PortableServer/Makefile.bor +++ b/TAO/tao/PortableServer/Makefile.bor @@ -26,7 +26,7 @@ OBJFILES = \ $(OBJDIR)\Servant_Base.obj \ $(OBJDIR)\Strategized_Object_Proxy_Broker.obj \ $(OBJDIR)\ThruPOA_Object_Proxy_Impl.obj -x + !ifdef STATIC CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS) !else |