diff options
| author | Angelo Corsaro <angelo@icorsaro.net> | 2001-06-14 17:28:20 +0000 |
|---|---|---|
| committer | Angelo Corsaro <angelo@icorsaro.net> | 2001-06-14 17:28:20 +0000 |
| commit | 0ee5c127be94349fe74b1b2f12876acbccb7705f (patch) | |
| tree | 62e0c9c2337d0fb3e328c0fd82473db00408738e /TAO | |
| parent | badfb5bda96fc5ebb432d13949bab187bd348de0 (diff) | |
| download | ATCD-0ee5c127be94349fe74b1b2f12876acbccb7705f.tar.gz | |
ChangeLogTag: Thu Jun 14 12:22:52 2001 Angelo Corsaro <corsaro@cs.wustl.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/POA.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 6ad08cabc93..175e639cb31 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Thu Jun 14 12:22:52 2001 Angelo Corsaro <corsaro@cs.wustl.edu> + + * tao/PortableServer/POA.h: Temporarily reverted change described in + Wed Jun 13 17:02:27 2001 Angelo Corsaro <corsaro@cs.wustl.edu> + That change wile fixing Borland Compiler and GCC 3.0 was + breaking VC++ builds. + Thu Jun 14 09:53:45 2001 Ossama Othman <ossama@uci.edu> * tao/ORB.cpp (object_to_string): diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h index eaadc24fd92..9fb46cb4b59 100644 --- a/TAO/tao/PortableServer/POA.h +++ b/TAO/tao/PortableServer/POA.h @@ -127,7 +127,7 @@ protected: class ServerObject_i; class TAO_PortableServer_Export TAO_POA : - public virtual PortableServer::POA , + public PortableServer::POA , public TAO_Local_RefCounted_Object { public: |