summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2005-09-29 14:15:26 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2005-09-29 14:15:26 +0000
commit875b8b44cf817d7e9e7c7e6d6ecbe67042e06920 (patch)
tree7065c275ccce94fc3afe3daf42fcaef3f3fb23a3
parentcb251bb720d385568e390af1f3a301717a64e204 (diff)
downloadATCD-875b8b44cf817d7e9e7c7e6d6ecbe67042e06920.tar.gz
ChangeLogTag: Thu Sep 29 09:12:24 2005 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tao/SmartProxies/Smart_Proxies.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 936e9406be2..79fc3c0e7f0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Sep 29 09:12:24 2005 Chad Elliott <elliott_c@ociweb.com>
+
+ * tao/SmartProxies/Smart_Proxies.h:
+
+ Removed the virtual from the inheritance list. It is not
+ necessary.
+
Thu Sep 29 14:29:17 2005 Simon McQueen <sm@prismtech.com>
* orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.h b/TAO/tao/SmartProxies/Smart_Proxies.h
index ec0bf1934ec..f8810fc8d40 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.h
+++ b/TAO/tao/SmartProxies/Smart_Proxies.h
@@ -35,7 +35,7 @@
* Contains the _var pointer to the real proxy.
*/
class TAO_SmartProxies_Export TAO_Smart_Proxy_Base :
- public virtual TAO_Local_RefCounted_Object
+ public TAO_Local_RefCounted_Object
{
public: