Stuff to prevent "widening assignment" of vars.

28 files changed, 624 insertions, 188 deletions

diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index 1045dea6352..d0351b57155 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -56,7 +56,7 @@ typedef CORBA_Current *CORBA_Current_ptr;
 #if !defined (_CORBA_CURRENT___VAR_CH_)
 #define _CORBA_CURRENT___VAR_CH_
 
-class  CORBA_Current_var
+class  CORBA_Current_var : public TAO_Base_var
 {
 public:
   CORBA_Current_var (void); // default constructor
@@ -79,6 +79,9 @@ public:
 
 private:
   CORBA_Current_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_Current_var (const TAO_Base_var &rhs);
+  CORBA_Current_var &operator= (const TAO_Base_var &rhs);
 };
 
 
diff --git a/TAO/tao/CurrentC.i b/TAO/tao/CurrentC.i
index e4232c052e2..eced4d0320e 100644
--- a/TAO/tao/CurrentC.i
+++ b/TAO/tao/CurrentC.i
@@ -46,7 +46,8 @@ CORBA_Current_var::ptr (void) const
 
 ACE_INLINE
 CORBA_Current_var::CORBA_Current_var (const CORBA_Current_var &p) // copy constructor
-  : ptr_ (CORBA_Current::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_Current::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 4ab1571dd28..8e3485a7c0e 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -35,7 +35,7 @@ class IR_InterfaceDef;
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_Export CORBA_DomainManager_var
+class TAO_Export CORBA_DomainManager_var : public TAO_Base_var
 {
 public:
   CORBA_DomainManager_var (void); // default constructor
@@ -58,6 +58,9 @@ public:
 
 private:
   CORBA_DomainManager_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_DomainManager_var (const TAO_Base_var &rhs);
+  CORBA_DomainManager_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export CORBA_DomainManager_out
@@ -205,7 +208,7 @@ private:
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-class TAO_Export CORBA_ConstructionPolicy_var
+class TAO_Export CORBA_ConstructionPolicy_var : public TAO_Base_var
 {
 public:
   CORBA_ConstructionPolicy_var (void); // default constructor
@@ -228,6 +231,9 @@ public:
 
 private:
   CORBA_ConstructionPolicy_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_ConstructionPolicy_var (const TAO_Base_var &rhs);
+  CORBA_ConstructionPolicy_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export CORBA_ConstructionPolicy_out
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
index fb6e8f79a43..479f2abff13 100644
--- a/TAO/tao/DomainC.i
+++ b/TAO/tao/DomainC.i
@@ -46,7 +46,8 @@ CORBA_DomainManager_var::ptr (void) const
 
 ACE_INLINE
 CORBA_DomainManager_var::CORBA_DomainManager_var (const CORBA::DomainManager_var &p) // copy constructor
-  : ptr_ (CORBA::DomainManager::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA::DomainManager::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -227,7 +228,8 @@ CORBA_ConstructionPolicy_var::ptr (void) const
 
 ACE_INLINE
 CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (const CORBA_ConstructionPolicy_var &p) // copy constructor
-  : ptr_ (CORBA_ConstructionPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_ConstructionPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
index 4adf53f842c..c4829b806c9 100644
--- a/TAO/tao/DynAnyC.h
+++ b/TAO/tao/DynAnyC.h
@@ -55,7 +55,7 @@
 class CORBA_DynAny;
 typedef CORBA_DynAny *CORBA_DynAny_ptr;
 
-class TAO_Export CORBA_DynAny_var
+class TAO_Export CORBA_DynAny_var : public TAO_Base_var
 {
 public:
   CORBA_DynAny_var (void); // default constructor
@@ -79,6 +79,9 @@ public:
 
 private:
   CORBA_DynAny_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_DynAny_var (const TAO_Base_var &rhs);
+  CORBA_DynAny_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export CORBA_DynAny_out
@@ -437,7 +440,7 @@ extern  CORBA::TypeCode_ptr  _tc_CORBA_DynAny;
 class CORBA_DynEnum;
 typedef CORBA_DynEnum *CORBA_DynEnum_ptr;
 
-class TAO_Export CORBA_DynEnum_var
+class TAO_Export CORBA_DynEnum_var : public TAO_Base_var
 {
 public:
   CORBA_DynEnum_var (void); // default constructor
@@ -460,6 +463,9 @@ public:
 
 private:
   CORBA_DynEnum_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_DynEnum_var (const TAO_Base_var &rhs);
+  CORBA_DynEnum_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export CORBA_DynEnum_out
@@ -723,7 +729,7 @@ private:
 class CORBA_DynStruct;
 typedef CORBA_DynStruct *CORBA_DynStruct_ptr;
 
-class TAO_Export CORBA_DynStruct_var
+class TAO_Export CORBA_DynStruct_var : public TAO_Base_var
 {
 public:
   CORBA_DynStruct_var (void); // default constructor
@@ -746,6 +752,9 @@ public:
 
 private:
   CORBA_DynStruct_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_DynStruct_var (const TAO_Base_var &rhs);
+  CORBA_DynStruct_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export CORBA_DynStruct_out
@@ -822,7 +831,7 @@ extern  CORBA::TypeCode_ptr  _tc_CORBA_DynStruct;
 class CORBA_DynUnion;
 typedef CORBA_DynUnion *CORBA_DynUnion_ptr;
 
-class TAO_Export CORBA_DynUnion_var
+class TAO_Export CORBA_DynUnion_var : public TAO_Base_var
 {
 public:
   CORBA_DynUnion_var (void); // default constructor
@@ -845,6 +854,9 @@ public:
 
 private:
   CORBA_DynUnion_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_DynUnion_var (const TAO_Base_var &rhs);
+  CORBA_DynUnion_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export CORBA_DynUnion_out
@@ -1210,7 +1222,7 @@ extern  CORBA::TypeCode_ptr  _tc_AnySeq;
 class CORBA_DynSequence;
 typedef CORBA_DynSequence *CORBA_DynSequence_ptr;
 
-class TAO_Export CORBA_DynSequence_var
+class TAO_Export CORBA_DynSequence_var : public TAO_Base_var
 {
 public:
   CORBA_DynSequence_var (void); // default constructor
@@ -1233,6 +1245,9 @@ public:
 
 private:
   CORBA_DynSequence_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_DynSequence_var (const TAO_Base_var &rhs);
+  CORBA_DynSequence_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export CORBA_DynSequence_out
@@ -1310,7 +1325,7 @@ extern  CORBA::TypeCode_ptr  _tc_CORBA_DynSequence;
 class CORBA_DynArray;
 typedef CORBA_DynArray *CORBA_DynArray_ptr;
 
-class TAO_Export CORBA_DynArray_var
+class TAO_Export CORBA_DynArray_var : public TAO_Base_var
 {
 public:
   CORBA_DynArray_var (void); // default constructor
@@ -1333,6 +1348,9 @@ public:
 
 private:
   CORBA_DynArray_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_DynArray_var (const TAO_Base_var &rhs);
+  CORBA_DynArray_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export CORBA_DynArray_out
diff --git a/TAO/tao/DynAnyC.i b/TAO/tao/DynAnyC.i
index 98408f82964..fbc08a5746e 100644
--- a/TAO/tao/DynAnyC.i
+++ b/TAO/tao/DynAnyC.i
@@ -61,7 +61,8 @@ CORBA_DynAny_var::ptr (void) const
 
 ACE_INLINE
 CORBA_DynAny_var::CORBA_DynAny_var (const CORBA_DynAny_var &p) // copy constructor
-  : ptr_ (CORBA_DynAny::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_DynAny::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -264,7 +265,8 @@ CORBA_DynEnum_var::ptr (void) const
 
 ACE_INLINE
 CORBA_DynEnum_var::CORBA_DynEnum_var (const CORBA_DynEnum_var &p) // copy constructor
-  : ptr_ (CORBA_DynEnum::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_DynEnum::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -979,7 +981,8 @@ CORBA_DynStruct_var::ptr (void) const
 
 ACE_INLINE
 CORBA_DynStruct_var::CORBA_DynStruct_var (const CORBA_DynStruct_var &p) // copy constructor
-  : ptr_ (CORBA_DynStruct::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_DynStruct::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1166,7 +1169,8 @@ CORBA_DynUnion_var::ptr (void) const
 
 ACE_INLINE
 CORBA_DynUnion_var::CORBA_DynUnion_var (const CORBA_DynUnion_var &p) // copy constructor
-  : ptr_ (CORBA_DynUnion::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_DynUnion::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1536,7 +1540,8 @@ CORBA_DynSequence_var::ptr (void) const
 
 ACE_INLINE
 CORBA_DynSequence_var::CORBA_DynSequence_var (const CORBA_DynSequence_var &p) // copy constructor
-  : ptr_ (CORBA_DynSequence::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_DynSequence::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1723,7 +1728,8 @@ CORBA_DynArray_var::ptr (void) const
 
 ACE_INLINE
 CORBA_DynArray_var::CORBA_DynArray_var (const CORBA_DynArray_var &p) // copy constructor
-  : ptr_ (CORBA_DynArray::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_DynArray::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/IORC.h b/TAO/tao/IORC.h
index 27647416b77..6b340b03fe9 100644
--- a/TAO/tao/IORC.h
+++ b/TAO/tao/IORC.h
@@ -52,7 +52,7 @@ TAO_NAMESPACE  TAO_IOP
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_
 
-  class TAO_Export TAO_IOR_Manipulation_var
+  class TAO_Export TAO_IOR_Manipulation_var : public TAO_Base_var
   {
   public:
     TAO_IOR_Manipulation_var (void); // default constructor
@@ -75,6 +75,9 @@ TAO_NAMESPACE  TAO_IOP
 
   private:
     TAO_IOR_Manipulation_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    TAO_IOR_Manipulation_var (const TAO_Base_var &rhs);
+    TAO_IOR_Manipulation_var &operator= (const TAO_Base_var &rhs);
   };
 
 
diff --git a/TAO/tao/IORC.i b/TAO/tao/IORC.i
index 372c1ac5cc2..8d8b574b948 100644
--- a/TAO/tao/IORC.i
+++ b/TAO/tao/IORC.i
@@ -53,7 +53,8 @@ TAO_IOP::TAO_IOR_Manipulation_var::ptr (void) const
 
 ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (const TAO_IOP::TAO_IOR_Manipulation_var &p) // copy constructor
-  : ptr_ (TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/ImplRepoC.h b/TAO/tao/ImplRepoC.h
index 5d05cd14911..1bab032e4ea 100644
--- a/TAO/tao/ImplRepoC.h
+++ b/TAO/tao/ImplRepoC.h
@@ -64,7 +64,7 @@ TAO_NAMESPACE  ImplementationRepository
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_
 
-  class TAO_Export ServerObject_var
+  class TAO_Export ServerObject_var : public TAO_Base_var
   {
   public:
     ServerObject_var (void); // default constructor
@@ -87,6 +87,9 @@ TAO_NAMESPACE  ImplementationRepository
 
   private:
     ServerObject_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ServerObject_var (const TAO_Base_var &rhs);
+    ServerObject_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -790,7 +793,7 @@ typedef ServerInformationIterator *ServerInformationIterator_ptr;
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
 
-class TAO_Export ServerInformationIterator_var
+class TAO_Export ServerInformationIterator_var : public TAO_Base_var
 {
 public:
   ServerInformationIterator_var (void); // default constructor
@@ -813,6 +816,9 @@ public:
 
 private:
   ServerInformationIterator_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  ServerInformationIterator_var (const TAO_Base_var &rhs);
+  ServerInformationIterator_var &operator= (const TAO_Base_var &rhs);
 };
 
 
@@ -855,7 +861,7 @@ typedef Administration *Administration_ptr;
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_
 
-class TAO_Export Administration_var
+class TAO_Export Administration_var : public TAO_Base_var
 {
 public:
   Administration_var (void); // default constructor
@@ -878,6 +884,9 @@ public:
 
 private:
   Administration_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  Administration_var (const TAO_Base_var &rhs);
+  Administration_var &operator= (const TAO_Base_var &rhs);
 };
 
 
@@ -1339,7 +1348,7 @@ typedef ServerInformationIterator *ServerInformationIterator_ptr;
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
 
-class TAO_Export ServerInformationIterator_var
+class TAO_Export ServerInformationIterator_var : public TAO_Base_var
 {
 public:
   ServerInformationIterator_var (void); // default constructor
@@ -1362,6 +1371,9 @@ public:
 
 private:
   ServerInformationIterator_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  ServerInformationIterator_var (const TAO_Base_var &rhs);
+  ServerInformationIterator_var &operator= (const TAO_Base_var &rhs);
 };
 
 
diff --git a/TAO/tao/ImplRepoC.i b/TAO/tao/ImplRepoC.i
index 71caac39e89..a8b27fc8170 100644
--- a/TAO/tao/ImplRepoC.i
+++ b/TAO/tao/ImplRepoC.i
@@ -46,7 +46,8 @@ ImplementationRepository::ServerObject_var::ptr (void) const
 
 ACE_INLINE
 ImplementationRepository::ServerObject_var::ServerObject_var (const ::ImplementationRepository::ServerObject_var &p) // copy constructor
-  : ptr_ (ServerObject::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (ServerObject::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1501,7 +1502,8 @@ ImplementationRepository::Administration_var::ptr (void) const
 
 ACE_INLINE
 ImplementationRepository::Administration_var::Administration_var (const ::ImplementationRepository::Administration_var &p) // copy constructor
-  : ptr_ (Administration::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (Administration::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1700,7 +1702,8 @@ ImplementationRepository::ServerInformationIterator_var::ptr (void) const
 
 ACE_INLINE
 ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (const ::ImplementationRepository::ServerInformationIterator_var &p) // copy constructor
-  : ptr_ (ServerInformationIterator::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (ServerInformationIterator::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/InterceptorC.h b/TAO/tao/InterceptorC.h
index b7e4e39d3d7..83b93072b2b 100644
--- a/TAO/tao/InterceptorC.h
+++ b/TAO/tao/InterceptorC.h
@@ -59,7 +59,7 @@ TAO_NAMESPACE  PortableInterceptor
 #if !defined (_PORTABLEINTERCEPTOR_COOKIE___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_COOKIE___VAR_CH_
 
-  class TAO_Export Cookie_var
+  class TAO_Export Cookie_var : public TAO_Base_var
   {
   public:
     Cookie_var (void); // default constructor
@@ -82,6 +82,9 @@ TAO_NAMESPACE  PortableInterceptor
 
   private:
     Cookie_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    Cookie_var (const TAO_Base_var &rhs);
+    Cookie_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -325,7 +328,7 @@ class TAO_Export Cookie : public virtual CORBA_Object
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_
 
-  class TAO_Export Interceptor_var
+  class TAO_Export Interceptor_var : public TAO_Base_var
   {
   public:
     Interceptor_var (void); // default constructor
@@ -348,6 +351,9 @@ class TAO_Export Cookie : public virtual CORBA_Object
 
   private:
     Interceptor_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    Interceptor_var (const TAO_Base_var &rhs);
+    Interceptor_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -442,7 +448,7 @@ class TAO_Export Interceptor : public virtual CORBA_Object
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_
 
-  class TAO_Export ServerRequestInterceptor_var
+  class TAO_Export ServerRequestInterceptor_var : public TAO_Base_var
   {
   public:
     ServerRequestInterceptor_var (void); // default constructor
@@ -465,6 +471,9 @@ class TAO_Export Interceptor : public virtual CORBA_Object
 
   private:
     ServerRequestInterceptor_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ServerRequestInterceptor_var (const TAO_Base_var &rhs);
+    ServerRequestInterceptor_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -594,7 +603,7 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_
 
-  class TAO_Export ClientRequestInterceptor_var
+  class TAO_Export ClientRequestInterceptor_var : public TAO_Base_var
   {
   public:
     ClientRequestInterceptor_var (void); // default constructor
@@ -617,6 +626,9 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
 
   private:
     ClientRequestInterceptor_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ClientRequestInterceptor_var (const TAO_Base_var &rhs);
+    ClientRequestInterceptor_var &operator= (const TAO_Base_var &rhs);
   };
 
 
diff --git a/TAO/tao/InterceptorC.i b/TAO/tao/InterceptorC.i
index bcd2e40eb2e..35069939dd8 100644
--- a/TAO/tao/InterceptorC.i
+++ b/TAO/tao/InterceptorC.i
@@ -41,7 +41,8 @@ PortableInterceptor::Cookie_var::ptr (void) const
 
 ACE_INLINE
 PortableInterceptor::Cookie_var::Cookie_var (const ::PortableInterceptor::Cookie_var &p) // copy constructor
-  : ptr_ (Cookie::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (Cookie::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -573,7 +574,8 @@ PortableInterceptor::Interceptor_var::ptr (void) const
 
 ACE_INLINE
 PortableInterceptor::Interceptor_var::Interceptor_var (const ::PortableInterceptor::Interceptor_var &p) // copy constructor
-  : ptr_ (Interceptor::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (Interceptor::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -755,7 +757,8 @@ PortableInterceptor::ServerRequestInterceptor_var::ptr (void) const
 
 ACE_INLINE
 PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (const ::PortableInterceptor::ServerRequestInterceptor_var &p) // copy constructor
-  : ptr_ (ServerRequestInterceptor::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (ServerRequestInterceptor::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -937,7 +940,8 @@ PortableInterceptor::ClientRequestInterceptor_var::ptr (void) const
 
 ACE_INLINE
 PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (const ::PortableInterceptor::ClientRequestInterceptor_var &p) // copy constructor
-  : ptr_ (ClientRequestInterceptor::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (ClientRequestInterceptor::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/InterfaceC.h b/TAO/tao/InterfaceC.h
index 3380deccb71..306b88253cf 100644
--- a/TAO/tao/InterfaceC.h
+++ b/TAO/tao/InterfaceC.h
@@ -46,7 +46,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-  class TAO_Export CORBA_IRObject_var
+  class TAO_Export CORBA_IRObject_var : public TAO_Base_var
   {
   public:
     CORBA_IRObject_var (void); // default constructor
@@ -69,6 +69,9 @@
 
   private:
     CORBA_IRObject_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    CORBA_IRObject_var (const TAO_Base_var &rhs);
+    CORBA_IRObject_var &operator= (const TAO_Base_var &rhs);
   };
 
   class TAO_Export CORBA_IRObject_out
@@ -226,7 +229,7 @@ private:
   ::CORBA::IRObject_var base_proxy_;
 };
 
-  class TAO_Export IR_Contained_var
+  class TAO_Export IR_Contained_var : public TAO_Base_var
   {
   public:
     IR_Contained_var (void); // default constructor
@@ -249,6 +252,9 @@ private:
 
   private:
     IR_Contained_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    IR_Contained_var (const TAO_Base_var &rhs);
+    IR_Contained_var &operator= (const TAO_Base_var &rhs);
   };
 
   class TAO_Export IR_Contained_out
@@ -268,7 +274,7 @@ private:
     IR_Contained_ptr &ptr_;
   };
 
-  class TAO_Export IR_Repository_var
+  class TAO_Export IR_Repository_var : public TAO_Base_var
   {
   public:
     IR_Repository_var (void); // default constructor
@@ -291,6 +297,9 @@ private:
 
   private:
     IR_Repository_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    IR_Repository_var (const TAO_Base_var &rhs);
+    IR_Repository_var &operator= (const TAO_Base_var &rhs);
   };
 
   class TAO_Export IR_Repository_out
@@ -310,7 +319,7 @@ private:
     IR_Repository_ptr &ptr_;
   };
 
-  class TAO_Export IR_Container_var
+  class TAO_Export IR_Container_var : public TAO_Base_var
   {
   public:
     IR_Container_var (void); // default constructor
@@ -333,6 +342,9 @@ private:
 
   private:
     IR_Container_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    IR_Container_var (const TAO_Base_var &rhs);
+    IR_Container_var &operator= (const TAO_Base_var &rhs);
   };
 
   class TAO_Export IR_Container_out
@@ -711,7 +723,7 @@ private:
   IR_Contained_var base_proxy_;
 };
 
-class TAO_Export IR_ModuleDef_var
+class TAO_Export IR_ModuleDef_var : public TAO_Base_var
 {
 public:
   IR_ModuleDef_var (void); // default constructor
@@ -734,6 +746,9 @@ public:
 
 private:
   IR_ModuleDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_ModuleDef_var (const TAO_Base_var &rhs);
+  IR_ModuleDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_ModuleDef_out
@@ -753,7 +768,7 @@ private:
   IR_ModuleDef_ptr &ptr_;
 };
 
-class TAO_Export IR_ConstantDef_var
+class TAO_Export IR_ConstantDef_var : public TAO_Base_var
 {
 public:
   IR_ConstantDef_var (void); // default constructor
@@ -776,6 +791,9 @@ public:
 
 private:
   IR_ConstantDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_ConstantDef_var (const TAO_Base_var &rhs);
+  IR_ConstantDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_ConstantDef_out
@@ -795,7 +813,7 @@ private:
   IR_ConstantDef_ptr &ptr_;
 };
 
-class TAO_Export IR_IDLType_var
+class TAO_Export IR_IDLType_var : public TAO_Base_var
 {
 public:
   IR_IDLType_var (void); // default constructor
@@ -818,6 +836,9 @@ public:
 
 private:
   IR_IDLType_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_IDLType_var (const TAO_Base_var &rhs);
+  IR_IDLType_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_IDLType_out
@@ -837,7 +858,7 @@ private:
   IR_IDLType_ptr &ptr_;
 };
 
-class TAO_Export IR_StructDef_var
+class TAO_Export IR_StructDef_var : public TAO_Base_var
 {
 public:
   IR_StructDef_var (void); // default constructor
@@ -860,6 +881,9 @@ public:
 
 private:
   IR_StructDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_StructDef_var (const TAO_Base_var &rhs);
+  IR_StructDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_StructDef_out
@@ -879,7 +903,7 @@ private:
   IR_StructDef_ptr &ptr_;
 };
 
-class TAO_Export IR_UnionDef_var
+class TAO_Export IR_UnionDef_var : public TAO_Base_var
 {
 public:
   IR_UnionDef_var (void); // default constructor
@@ -902,6 +926,9 @@ public:
 
 private:
   IR_UnionDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_UnionDef_var (const TAO_Base_var &rhs);
+  IR_UnionDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_UnionDef_out
@@ -921,7 +948,7 @@ private:
   IR_UnionDef_ptr &ptr_;
 };
 
-class TAO_Export IR_EnumDef_var
+class TAO_Export IR_EnumDef_var : public TAO_Base_var
 {
 public:
   IR_EnumDef_var (void); // default constructor
@@ -944,6 +971,9 @@ public:
 
 private:
   IR_EnumDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_EnumDef_var (const TAO_Base_var &rhs);
+  IR_EnumDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_EnumDef_out
@@ -963,7 +993,7 @@ private:
   IR_EnumDef_ptr &ptr_;
 };
 
-class TAO_Export IR_AliasDef_var
+class TAO_Export IR_AliasDef_var : public TAO_Base_var
 {
 public:
   IR_AliasDef_var (void); // default constructor
@@ -986,6 +1016,9 @@ public:
 
 private:
   IR_AliasDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_AliasDef_var (const TAO_Base_var &rhs);
+  IR_AliasDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_AliasDef_out
@@ -1005,7 +1038,7 @@ private:
   IR_AliasDef_ptr &ptr_;
 };
 
-class TAO_Export IR_InterfaceDef_var
+class TAO_Export IR_InterfaceDef_var : public TAO_Base_var
 {
 public:
   IR_InterfaceDef_var (void); // default constructor
@@ -1028,6 +1061,9 @@ public:
 
 private:
   IR_InterfaceDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_InterfaceDef_var (const TAO_Base_var &rhs);
+  IR_InterfaceDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_InterfaceDef_out
@@ -1047,7 +1083,7 @@ private:
   IR_InterfaceDef_ptr &ptr_;
 };
 
-class TAO_Export IR_ExceptionDef_var
+class TAO_Export IR_ExceptionDef_var : public TAO_Base_var
 {
 public:
   IR_ExceptionDef_var (void); // default constructor
@@ -1070,6 +1106,9 @@ public:
 
 private:
   IR_ExceptionDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_ExceptionDef_var (const TAO_Base_var &rhs);
+  IR_ExceptionDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_ExceptionDef_out
@@ -1089,7 +1128,7 @@ private:
   IR_ExceptionDef_ptr &ptr_;
 };
 
-class TAO_Export IR_NativeDef_var
+class TAO_Export IR_NativeDef_var : public TAO_Base_var
 {
 public:
   IR_NativeDef_var (void); // default constructor
@@ -1112,6 +1151,9 @@ public:
 
 private:
   IR_NativeDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_NativeDef_var (const TAO_Base_var &rhs);
+  IR_NativeDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_NativeDef_out
@@ -1252,7 +1294,7 @@ private:
   void operator= (const IR_InterfaceDefSeq_var &);
 };
 
-class TAO_Export IR_ValueDef_var
+class TAO_Export IR_ValueDef_var : public TAO_Base_var
 {
 public:
   IR_ValueDef_var (void); // default constructor
@@ -1275,6 +1317,9 @@ public:
 
 private:
   IR_ValueDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_ValueDef_var (const TAO_Base_var &rhs);
+  IR_ValueDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_ValueDef_out
@@ -1414,7 +1459,7 @@ private:
   void operator= (const IR_ValueDefSeq_var &);
 };
 
-class TAO_Export IR_ValueBoxDef_var
+class TAO_Export IR_ValueBoxDef_var : public TAO_Base_var
 {
 public:
   IR_ValueBoxDef_var (void); // default constructor
@@ -1437,6 +1482,9 @@ public:
 
 private:
   IR_ValueBoxDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_ValueBoxDef_var (const TAO_Base_var &rhs);
+  IR_ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_ValueBoxDef_out
@@ -1456,7 +1504,7 @@ private:
   IR_ValueBoxDef_ptr &ptr_;
 };
 
-class TAO_Export IR_ComponentDef_var
+class TAO_Export IR_ComponentDef_var : public TAO_Base_var
 {
 public:
   IR_ComponentDef_var (void); // default constructor
@@ -1479,6 +1527,9 @@ public:
 
 private:
   IR_ComponentDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_ComponentDef_var (const TAO_Base_var &rhs);
+  IR_ComponentDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_ComponentDef_out
@@ -1618,7 +1669,7 @@ private:
   void operator= (const IR_ComponentDefSeq_var &);
 };
 
-class TAO_Export IR_ProvidesDef_var
+class TAO_Export IR_ProvidesDef_var : public TAO_Base_var
 {
 public:
   IR_ProvidesDef_var (void); // default constructor
@@ -1641,6 +1692,9 @@ public:
 
 private:
   IR_ProvidesDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_ProvidesDef_var (const TAO_Base_var &rhs);
+  IR_ProvidesDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_ProvidesDef_out
@@ -1780,7 +1834,7 @@ private:
   void operator= (const IR_ProvidesDefSeq_var &);
 };
 
-class TAO_Export IR_UsesDef_var
+class TAO_Export IR_UsesDef_var : public TAO_Base_var
 {
 public:
   IR_UsesDef_var (void); // default constructor
@@ -1803,6 +1857,9 @@ public:
 
 private:
   IR_UsesDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_UsesDef_var (const TAO_Base_var &rhs);
+  IR_UsesDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_UsesDef_out
@@ -1942,7 +1999,7 @@ private:
   void operator= (const IR_UsesDefSeq_var &);
 };
 
-class TAO_Export IR_HomeDef_var
+class TAO_Export IR_HomeDef_var : public TAO_Base_var
 {
 public:
   IR_HomeDef_var (void); // default constructor
@@ -1965,6 +2022,9 @@ public:
 
 private:
   IR_HomeDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_HomeDef_var (const TAO_Base_var &rhs);
+  IR_HomeDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_HomeDef_out
@@ -2104,7 +2164,7 @@ private:
   void operator= (const IR_HomeDefSeq_var &);
 };
 
-class TAO_Export IR_EventDef_var
+class TAO_Export IR_EventDef_var : public TAO_Base_var
 {
 public:
   IR_EventDef_var (void); // default constructor
@@ -2127,6 +2187,9 @@ public:
 
 private:
   IR_EventDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_EventDef_var (const TAO_Base_var &rhs);
+  IR_EventDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_EventDef_out
@@ -2146,7 +2209,7 @@ private:
   IR_EventDef_ptr &ptr_;
 };
 
-class TAO_Export IR_EmitsDef_var
+class TAO_Export IR_EmitsDef_var : public TAO_Base_var
 {
 public:
   IR_EmitsDef_var (void); // default constructor
@@ -2169,6 +2232,9 @@ public:
 
 private:
   IR_EmitsDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_EmitsDef_var (const TAO_Base_var &rhs);
+  IR_EmitsDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_EmitsDef_out
@@ -2308,7 +2374,7 @@ private:
   void operator= (const IR_EmitsDefSeq_var &);
 };
 
-class TAO_Export IR_PublishesDef_var
+class TAO_Export IR_PublishesDef_var : public TAO_Base_var
 {
 public:
   IR_PublishesDef_var (void); // default constructor
@@ -2331,6 +2397,9 @@ public:
 
 private:
   IR_PublishesDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_PublishesDef_var (const TAO_Base_var &rhs);
+  IR_PublishesDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_PublishesDef_out
@@ -2470,7 +2539,7 @@ private:
   void operator= (const IR_PublishesDefSeq_var &);
 };
 
-class TAO_Export IR_ConsumesDef_var
+class TAO_Export IR_ConsumesDef_var : public TAO_Base_var
 {
 public:
   IR_ConsumesDef_var (void); // default constructor
@@ -2493,6 +2562,9 @@ public:
 
 private:
   IR_ConsumesDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_ConsumesDef_var (const TAO_Base_var &rhs);
+  IR_ConsumesDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_ConsumesDef_out
@@ -2632,7 +2704,7 @@ private:
   void operator= (const IR_ConsumesDefSeq_var &);
 };
 
-class TAO_Export IR_FactoryDef_var
+class TAO_Export IR_FactoryDef_var : public TAO_Base_var
 {
 public:
   IR_FactoryDef_var (void); // default constructor
@@ -2655,6 +2727,9 @@ public:
 
 private:
   IR_FactoryDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_FactoryDef_var (const TAO_Base_var &rhs);
+  IR_FactoryDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_FactoryDef_out
@@ -2794,7 +2869,7 @@ private:
   void operator= (const IR_FactoryDefSeq_var &);
 };
 
-class TAO_Export IR_FinderDef_var
+class TAO_Export IR_FinderDef_var : public TAO_Base_var
 {
 public:
   IR_FinderDef_var (void); // default constructor
@@ -2817,6 +2892,9 @@ public:
 
 private:
   IR_FinderDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_FinderDef_var (const TAO_Base_var &rhs);
+  IR_FinderDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_FinderDef_out
@@ -2956,7 +3034,7 @@ private:
   void operator= (const IR_FinderDefSeq_var &);
 };
 
-class TAO_Export IR_PrimaryKeyDef_var
+class TAO_Export IR_PrimaryKeyDef_var : public TAO_Base_var
 {
 public:
   IR_PrimaryKeyDef_var (void); // default constructor
@@ -2979,6 +3057,9 @@ public:
 
 private:
   IR_PrimaryKeyDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_PrimaryKeyDef_var (const TAO_Base_var &rhs);
+  IR_PrimaryKeyDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_PrimaryKeyDef_out
@@ -4521,7 +4602,7 @@ private:
   ::IR_IDLType_var base_proxy_;
 };
 
-class TAO_Export IR_PrimitiveDef_var
+class TAO_Export IR_PrimitiveDef_var : public TAO_Base_var
 {
 public:
   IR_PrimitiveDef_var (void); // default constructor
@@ -4544,6 +4625,9 @@ public:
 
 private:
   IR_PrimitiveDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_PrimitiveDef_var (const TAO_Base_var &rhs);
+  IR_PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_PrimitiveDef_out
@@ -4563,7 +4647,7 @@ private:
   IR_PrimitiveDef_ptr &ptr_;
 };
 
-class TAO_Export IR_StringDef_var
+class TAO_Export IR_StringDef_var : public TAO_Base_var
 {
 public:
   IR_StringDef_var (void); // default constructor
@@ -4586,6 +4670,9 @@ public:
 
 private:
   IR_StringDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_StringDef_var (const TAO_Base_var &rhs);
+  IR_StringDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_StringDef_out
@@ -4605,7 +4692,7 @@ private:
   IR_StringDef_ptr &ptr_;
 };
 
-class TAO_Export IR_SequenceDef_var
+class TAO_Export IR_SequenceDef_var : public TAO_Base_var
 {
 public:
   IR_SequenceDef_var (void); // default constructor
@@ -4628,6 +4715,9 @@ public:
 
 private:
   IR_SequenceDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_SequenceDef_var (const TAO_Base_var &rhs);
+  IR_SequenceDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_SequenceDef_out
@@ -4647,7 +4737,7 @@ private:
   IR_SequenceDef_ptr &ptr_;
 };
 
-class TAO_Export IR_ArrayDef_var
+class TAO_Export IR_ArrayDef_var : public TAO_Base_var
 {
 public:
   IR_ArrayDef_var (void); // default constructor
@@ -4670,6 +4760,9 @@ public:
 
 private:
   IR_ArrayDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_ArrayDef_var (const TAO_Base_var &rhs);
+  IR_ArrayDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_ArrayDef_out
@@ -4689,7 +4782,7 @@ private:
   IR_ArrayDef_ptr &ptr_;
 };
 
-class TAO_Export IR_WstringDef_var
+class TAO_Export IR_WstringDef_var : public TAO_Base_var
 {
 public:
   IR_WstringDef_var (void); // default constructor
@@ -4712,6 +4805,9 @@ public:
 
 private:
   IR_WstringDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_WstringDef_var (const TAO_Base_var &rhs);
+  IR_WstringDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_WstringDef_out
@@ -4731,7 +4827,7 @@ private:
   IR_WstringDef_ptr &ptr_;
 };
 
-class TAO_Export IR_FixedDef_var
+class TAO_Export IR_FixedDef_var : public TAO_Base_var
 {
 public:
   IR_FixedDef_var (void); // default constructor
@@ -4754,6 +4850,9 @@ public:
 
 private:
   IR_FixedDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_FixedDef_var (const TAO_Base_var &rhs);
+  IR_FixedDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_FixedDef_out
@@ -5029,7 +5128,7 @@ private:
   ::IR_Repository_var base_proxy_;
 };
 
-class TAO_Export IR_ComponentRepository_var
+class TAO_Export IR_ComponentRepository_var : public TAO_Base_var
 {
 public:
   IR_ComponentRepository_var (void); // default constructor
@@ -5052,6 +5151,9 @@ public:
 
 private:
   IR_ComponentRepository_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_ComponentRepository_var (const TAO_Base_var &rhs);
+  IR_ComponentRepository_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_ComponentRepository_out
@@ -5653,7 +5755,7 @@ private:
   void operator= (const IR_ConstantDescription_var &);
 };
 
-class TAO_Export IR_TypedefDef_var
+class TAO_Export IR_TypedefDef_var : public TAO_Base_var
 {
 public:
   IR_TypedefDef_var (void); // default constructor
@@ -5676,6 +5778,9 @@ public:
 
 private:
   IR_TypedefDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_TypedefDef_var (const TAO_Base_var &rhs);
+  IR_TypedefDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_TypedefDef_out
@@ -7994,7 +8099,7 @@ private:
   void operator= (const IR_ExcDescriptionSeq_var &);
 };
 
-class TAO_Export IR_AttributeDef_var
+class TAO_Export IR_AttributeDef_var : public TAO_Base_var
 {
 public:
   IR_AttributeDef_var (void); // default constructor
@@ -8017,6 +8122,9 @@ public:
 
 private:
   IR_AttributeDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_AttributeDef_var (const TAO_Base_var &rhs);
+  IR_AttributeDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_AttributeDef_out
@@ -8556,7 +8664,7 @@ private:
   void operator= (const IR_ContextIdSeq_var &);
 };
 
-class TAO_Export IR_OperationDef_var
+class TAO_Export IR_OperationDef_var : public TAO_Base_var
 {
 public:
   IR_OperationDef_var (void); // default constructor
@@ -8579,6 +8687,9 @@ public:
 
 private:
   IR_OperationDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_OperationDef_var (const TAO_Base_var &rhs);
+  IR_OperationDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_OperationDef_out
@@ -9818,7 +9929,7 @@ private:
   void operator= (const IR_ValueMemberSeq_var &);
 };
 
-class TAO_Export IR_ValueMemberDef_var
+class TAO_Export IR_ValueMemberDef_var : public TAO_Base_var
 {
 public:
   IR_ValueMemberDef_var (void); // default constructor
@@ -9841,6 +9952,9 @@ public:
 
 private:
   IR_ValueMemberDef *ptr_;
+  // Unimplemented - prevents widening assignment.
+  IR_ValueMemberDef_var (const TAO_Base_var &rhs);
+  IR_ValueMemberDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export IR_ValueMemberDef_out
@@ -13070,7 +13184,7 @@ private:
   void operator= (const IR_HomeDescription_var &);
 };
 
-  class TAO_Export CORBA_TypeCodeFactory_var
+  class TAO_Export CORBA_TypeCodeFactory_var : public TAO_Base_var
   {
   public:
     CORBA_TypeCodeFactory_var (void); // default constructor
@@ -13093,6 +13207,9 @@ private:
 
   private:
     CORBA_TypeCodeFactory_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    CORBA_TypeCodeFactory_var (const TAO_Base_var &rhs);
+    CORBA_TypeCodeFactory_var &operator= (const TAO_Base_var &rhs);
   };
 
   class TAO_Export CORBA_TypeCodeFactory_out
diff --git a/TAO/tao/InterfaceC.i b/TAO/tao/InterfaceC.i
index 36c344b8902..a4d9560d9e8 100644
--- a/TAO/tao/InterfaceC.i
+++ b/TAO/tao/InterfaceC.i
@@ -47,7 +47,8 @@ CORBA_IRObject_var::ptr (void) const
 
 ACE_INLINE
 CORBA_IRObject_var::CORBA_IRObject_var (const CORBA::IRObject_var &p) // copy constructor
-  : ptr_ (CORBA::IRObject::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA::IRObject::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -234,7 +235,8 @@ IR_Contained_var::ptr (void) const
 
 ACE_INLINE
 IR_Contained_var::IR_Contained_var (const ::IR_Contained_var &p) // copy constructor
-  : ptr_ (IR_Contained::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_Contained::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -6630,7 +6632,8 @@ IR_Container_var::ptr (void) const
 
 ACE_INLINE
 IR_Container_var::IR_Container_var (const ::IR_Container_var &p) // copy constructor
-  : ptr_ (IR_Container::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_Container::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -7363,7 +7366,8 @@ IR_IDLType_var::ptr (void) const
 
 ACE_INLINE
 IR_IDLType_var::IR_IDLType_var (const ::IR_IDLType_var &p) // copy constructor
-  : ptr_ (IR_IDLType::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_IDLType::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -7550,7 +7554,8 @@ IR_Repository_var::ptr (void) const
 
 ACE_INLINE
 IR_Repository_var::IR_Repository_var (const ::IR_Repository_var &p) // copy constructor
-  : ptr_ (IR_Repository::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_Repository::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -7737,7 +7742,8 @@ IR_ComponentRepository_var::ptr (void) const
 
 ACE_INLINE
 IR_ComponentRepository_var::IR_ComponentRepository_var (const ::IR_ComponentRepository_var &p) // copy constructor
-  : ptr_ (IR_ComponentRepository::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_ComponentRepository::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -7924,7 +7930,8 @@ IR_ModuleDef_var::ptr (void) const
 
 ACE_INLINE
 IR_ModuleDef_var::IR_ModuleDef_var (const ::IR_ModuleDef_var &p) // copy constructor
-  : ptr_ (IR_ModuleDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_ModuleDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -8287,7 +8294,8 @@ IR_ConstantDef_var::ptr (void) const
 
 ACE_INLINE
 IR_ConstantDef_var::IR_ConstantDef_var (const ::IR_ConstantDef_var &p) // copy constructor
-  : ptr_ (IR_ConstantDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_ConstantDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -8650,7 +8658,8 @@ IR_TypedefDef_var::ptr (void) const
 
 ACE_INLINE
 IR_TypedefDef_var::IR_TypedefDef_var (const ::IR_TypedefDef_var &p) // copy constructor
-  : ptr_ (IR_TypedefDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_TypedefDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -9013,7 +9022,8 @@ IR_StructDef_var::ptr (void) const
 
 ACE_INLINE
 IR_StructDef_var::IR_StructDef_var (const ::IR_StructDef_var &p) // copy constructor
-  : ptr_ (IR_StructDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_StructDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -9200,7 +9210,8 @@ IR_UnionDef_var::ptr (void) const
 
 ACE_INLINE
 IR_UnionDef_var::IR_UnionDef_var (const ::IR_UnionDef_var &p) // copy constructor
-  : ptr_ (IR_UnionDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_UnionDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -9387,7 +9398,8 @@ IR_EnumDef_var::ptr (void) const
 
 ACE_INLINE
 IR_EnumDef_var::IR_EnumDef_var (const ::IR_EnumDef_var &p) // copy constructor
-  : ptr_ (IR_EnumDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_EnumDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -9574,7 +9586,8 @@ IR_AliasDef_var::ptr (void) const
 
 ACE_INLINE
 IR_AliasDef_var::IR_AliasDef_var (const ::IR_AliasDef_var &p) // copy constructor
-  : ptr_ (IR_AliasDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_AliasDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -9761,7 +9774,8 @@ IR_NativeDef_var::ptr (void) const
 
 ACE_INLINE
 IR_NativeDef_var::IR_NativeDef_var (const ::IR_NativeDef_var &p) // copy constructor
-  : ptr_ (IR_NativeDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_NativeDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -9948,7 +9962,8 @@ IR_PrimitiveDef_var::ptr (void) const
 
 ACE_INLINE
 IR_PrimitiveDef_var::IR_PrimitiveDef_var (const ::IR_PrimitiveDef_var &p) // copy constructor
-  : ptr_ (IR_PrimitiveDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_PrimitiveDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -10135,7 +10150,8 @@ IR_StringDef_var::ptr (void) const
 
 ACE_INLINE
 IR_StringDef_var::IR_StringDef_var (const ::IR_StringDef_var &p) // copy constructor
-  : ptr_ (IR_StringDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_StringDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -10322,7 +10338,8 @@ IR_WstringDef_var::ptr (void) const
 
 ACE_INLINE
 IR_WstringDef_var::IR_WstringDef_var (const ::IR_WstringDef_var &p) // copy constructor
-  : ptr_ (IR_WstringDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_WstringDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -10509,7 +10526,8 @@ IR_FixedDef_var::ptr (void) const
 
 ACE_INLINE
 IR_FixedDef_var::IR_FixedDef_var (const ::IR_FixedDef_var &p) // copy constructor
-  : ptr_ (IR_FixedDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_FixedDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -10696,7 +10714,8 @@ IR_SequenceDef_var::ptr (void) const
 
 ACE_INLINE
 IR_SequenceDef_var::IR_SequenceDef_var (const ::IR_SequenceDef_var &p) // copy constructor
-  : ptr_ (IR_SequenceDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_SequenceDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -10883,7 +10902,8 @@ IR_ArrayDef_var::ptr (void) const
 
 ACE_INLINE
 IR_ArrayDef_var::IR_ArrayDef_var (const ::IR_ArrayDef_var &p) // copy constructor
-  : ptr_ (IR_ArrayDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_ArrayDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -11070,7 +11090,8 @@ IR_ExceptionDef_var::ptr (void) const
 
 ACE_INLINE
 IR_ExceptionDef_var::IR_ExceptionDef_var (const ::IR_ExceptionDef_var &p) // copy constructor
-  : ptr_ (IR_ExceptionDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_ExceptionDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -12153,7 +12174,8 @@ IR_AttributeDef_var::ptr (void) const
 
 ACE_INLINE
 IR_AttributeDef_var::IR_AttributeDef_var (const ::IR_AttributeDef_var &p) // copy constructor
-  : ptr_ (IR_AttributeDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_AttributeDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -13257,7 +13279,8 @@ IR_OperationDef_var::ptr (void) const
 
 ACE_INLINE
 IR_OperationDef_var::IR_OperationDef_var (const ::IR_OperationDef_var &p) // copy constructor
-  : ptr_ (IR_OperationDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_OperationDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -14555,7 +14578,8 @@ IR_InterfaceDef_var::ptr (void) const
 
 ACE_INLINE
 IR_InterfaceDef_var::IR_InterfaceDef_var (const ::IR_InterfaceDef_var &p) // copy constructor
-  : ptr_ (IR_InterfaceDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_InterfaceDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -15464,7 +15488,8 @@ IR_ValueMemberDef_var::ptr (void) const
 
 ACE_INLINE
 IR_ValueMemberDef_var::IR_ValueMemberDef_var (const ::IR_ValueMemberDef_var &p) // copy constructor
-  : ptr_ (IR_ValueMemberDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_ValueMemberDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -15651,7 +15676,8 @@ IR_ValueDef_var::ptr (void) const
 
 ACE_INLINE
 IR_ValueDef_var::IR_ValueDef_var (const ::IR_ValueDef_var &p) // copy constructor
-  : ptr_ (IR_ValueDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_ValueDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -16014,7 +16040,8 @@ IR_ValueBoxDef_var::ptr (void) const
 
 ACE_INLINE
 IR_ValueBoxDef_var::IR_ValueBoxDef_var (const ::IR_ValueBoxDef_var &p) // copy constructor
-  : ptr_ (IR_ValueBoxDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_ValueBoxDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -16201,7 +16228,8 @@ IR_ProvidesDef_var::ptr (void) const
 
 ACE_INLINE
 IR_ProvidesDef_var::IR_ProvidesDef_var (const ::IR_ProvidesDef_var &p) // copy constructor
-  : ptr_ (IR_ProvidesDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_ProvidesDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -16564,7 +16592,8 @@ IR_UsesDef_var::ptr (void) const
 
 ACE_INLINE
 IR_UsesDef_var::IR_UsesDef_var (const ::IR_UsesDef_var &p) // copy constructor
-  : ptr_ (IR_UsesDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_UsesDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -17667,7 +17696,8 @@ IR_EventDef_var::ptr (void) const
 
 ACE_INLINE
 IR_EventDef_var::IR_EventDef_var (const ::IR_EventDef_var &p) // copy constructor
-  : ptr_ (IR_EventDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_EventDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -18030,7 +18060,8 @@ IR_EmitsDef_var::ptr (void) const
 
 ACE_INLINE
 IR_EmitsDef_var::IR_EmitsDef_var (const ::IR_EmitsDef_var &p) // copy constructor
-  : ptr_ (IR_EmitsDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_EmitsDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -18217,7 +18248,8 @@ IR_PublishesDef_var::ptr (void) const
 
 ACE_INLINE
 IR_PublishesDef_var::IR_PublishesDef_var (const ::IR_PublishesDef_var &p) // copy constructor
-  : ptr_ (IR_PublishesDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_PublishesDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -18404,7 +18436,8 @@ IR_ConsumesDef_var::ptr (void) const
 
 ACE_INLINE
 IR_ConsumesDef_var::IR_ConsumesDef_var (const ::IR_ConsumesDef_var &p) // copy constructor
-  : ptr_ (IR_ConsumesDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_ConsumesDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -18591,7 +18624,8 @@ IR_ComponentDef_var::ptr (void) const
 
 ACE_INLINE
 IR_ComponentDef_var::IR_ComponentDef_var (const ::IR_ComponentDef_var &p) // copy constructor
-  : ptr_ (IR_ComponentDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_ComponentDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -18954,7 +18988,8 @@ IR_PrimaryKeyDef_var::ptr (void) const
 
 ACE_INLINE
 IR_PrimaryKeyDef_var::IR_PrimaryKeyDef_var (const ::IR_PrimaryKeyDef_var &p) // copy constructor
-  : ptr_ (IR_PrimaryKeyDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_PrimaryKeyDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -19317,7 +19352,8 @@ IR_FactoryDef_var::ptr (void) const
 
 ACE_INLINE
 IR_FactoryDef_var::IR_FactoryDef_var (const ::IR_FactoryDef_var &p) // copy constructor
-  : ptr_ (IR_FactoryDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_FactoryDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -19504,7 +19540,8 @@ IR_FinderDef_var::ptr (void) const
 
 ACE_INLINE
 IR_FinderDef_var::IR_FinderDef_var (const ::IR_FinderDef_var &p) // copy constructor
-  : ptr_ (IR_FinderDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_FinderDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -19691,7 +19728,8 @@ IR_HomeDef_var::ptr (void) const
 
 ACE_INLINE
 IR_HomeDef_var::IR_HomeDef_var (const ::IR_HomeDef_var &p) // copy constructor
-  : ptr_ (IR_HomeDef::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (IR_HomeDef::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -20054,7 +20092,8 @@ CORBA_TypeCodeFactory_var::ptr (void) const
 
 ACE_INLINE
 CORBA_TypeCodeFactory_var::CORBA_TypeCodeFactory_var (const ::CORBA_TypeCodeFactory_var &p) // copy constructor
-  : ptr_ (CORBA_TypeCodeFactory::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_TypeCodeFactory::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index 7657bd0b6a0..d95e5ac65c7 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -137,7 +137,7 @@ TAO_NAMESPACE  Messaging
 #if !defined (_MESSAGING_REBINDPOLICY___VAR_CH_)
 #define _MESSAGING_REBINDPOLICY___VAR_CH_
 
-  class TAO_Export RebindPolicy_var
+  class TAO_Export RebindPolicy_var : public TAO_Base_var
   {
   public:
     RebindPolicy_var (void); // default constructor
@@ -160,6 +160,9 @@ TAO_NAMESPACE  Messaging
 
   private:
     RebindPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    RebindPolicy_var (const TAO_Base_var &rhs);
+    RebindPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -260,7 +263,7 @@ class TAO_Export RebindPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_SYNCSCOPEPOLICY___VAR_CH_)
 #define _MESSAGING_SYNCSCOPEPOLICY___VAR_CH_
 
-  class TAO_Export SyncScopePolicy_var
+  class TAO_Export SyncScopePolicy_var : public TAO_Base_var
   {
   public:
     SyncScopePolicy_var (void); // default constructor
@@ -283,6 +286,9 @@ class TAO_Export RebindPolicy: public virtual CORBA::Policy
 
   private:
     SyncScopePolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    SyncScopePolicy_var (const TAO_Base_var &rhs);
+    SyncScopePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -433,7 +439,7 @@ class TAO_Export SyncScopePolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___VAR_CH_)
 #define _MESSAGING_REQUESTPRIORITYPOLICY___VAR_CH_
 
-  class TAO_Export RequestPriorityPolicy_var
+  class TAO_Export RequestPriorityPolicy_var : public TAO_Base_var
   {
   public:
     RequestPriorityPolicy_var (void); // default constructor
@@ -456,6 +462,9 @@ class TAO_Export SyncScopePolicy: public virtual CORBA::Policy
 
   private:
     RequestPriorityPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    RequestPriorityPolicy_var (const TAO_Base_var &rhs);
+    RequestPriorityPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -552,7 +561,7 @@ class TAO_Export RequestPriorityPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REPLYPRIORITYPOLICY___VAR_CH_)
 #define _MESSAGING_REPLYPRIORITYPOLICY___VAR_CH_
 
-  class TAO_Export ReplyPriorityPolicy_var
+  class TAO_Export ReplyPriorityPolicy_var : public TAO_Base_var
   {
   public:
     ReplyPriorityPolicy_var (void); // default constructor
@@ -575,6 +584,9 @@ class TAO_Export RequestPriorityPolicy: public virtual CORBA::Policy
 
   private:
     ReplyPriorityPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ReplyPriorityPolicy_var (const TAO_Base_var &rhs);
+    ReplyPriorityPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -675,7 +687,7 @@ class TAO_Export ReplyPriorityPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___VAR_CH_)
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY___VAR_CH_
 
-  class TAO_Export RequestStartTimePolicy_var
+  class TAO_Export RequestStartTimePolicy_var : public TAO_Base_var
   {
   public:
     RequestStartTimePolicy_var (void); // default constructor
@@ -698,6 +710,9 @@ class TAO_Export ReplyPriorityPolicy: public virtual CORBA::Policy
 
   private:
     RequestStartTimePolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    RequestStartTimePolicy_var (const TAO_Base_var &rhs);
+    RequestStartTimePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -798,7 +813,7 @@ class TAO_Export RequestStartTimePolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___VAR_CH_)
 #define _MESSAGING_REQUESTENDTIMEPOLICY___VAR_CH_
 
-  class TAO_Export RequestEndTimePolicy_var
+  class TAO_Export RequestEndTimePolicy_var : public TAO_Base_var
   {
   public:
     RequestEndTimePolicy_var (void); // default constructor
@@ -821,6 +836,9 @@ class TAO_Export RequestStartTimePolicy: public virtual CORBA::Policy
 
   private:
     RequestEndTimePolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    RequestEndTimePolicy_var (const TAO_Base_var &rhs);
+    RequestEndTimePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -921,7 +939,7 @@ class TAO_Export RequestEndTimePolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___VAR_CH_)
 #define _MESSAGING_REPLYSTARTTIMEPOLICY___VAR_CH_
 
-  class TAO_Export ReplyStartTimePolicy_var
+  class TAO_Export ReplyStartTimePolicy_var : public TAO_Base_var
   {
   public:
     ReplyStartTimePolicy_var (void); // default constructor
@@ -944,6 +962,9 @@ class TAO_Export RequestEndTimePolicy: public virtual CORBA::Policy
 
   private:
     ReplyStartTimePolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ReplyStartTimePolicy_var (const TAO_Base_var &rhs);
+    ReplyStartTimePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -1044,7 +1065,7 @@ class TAO_Export ReplyStartTimePolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REPLYENDTIMEPOLICY___VAR_CH_)
 #define _MESSAGING_REPLYENDTIMEPOLICY___VAR_CH_
 
-  class TAO_Export ReplyEndTimePolicy_var
+  class TAO_Export ReplyEndTimePolicy_var : public TAO_Base_var
   {
   public:
     ReplyEndTimePolicy_var (void); // default constructor
@@ -1067,6 +1088,9 @@ class TAO_Export ReplyStartTimePolicy: public virtual CORBA::Policy
 
   private:
     ReplyEndTimePolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ReplyEndTimePolicy_var (const TAO_Base_var &rhs);
+    ReplyEndTimePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -1167,7 +1191,7 @@ class TAO_Export ReplyEndTimePolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___VAR_CH_)
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___VAR_CH_
 
-  class TAO_Export RelativeRequestTimeoutPolicy_var
+  class TAO_Export RelativeRequestTimeoutPolicy_var : public TAO_Base_var
   {
   public:
     RelativeRequestTimeoutPolicy_var (void); // default constructor
@@ -1190,6 +1214,9 @@ class TAO_Export ReplyEndTimePolicy: public virtual CORBA::Policy
 
   private:
     RelativeRequestTimeoutPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    RelativeRequestTimeoutPolicy_var (const TAO_Base_var &rhs);
+    RelativeRequestTimeoutPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -1290,7 +1317,7 @@ class TAO_Export RelativeRequestTimeoutPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___VAR_CH_)
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___VAR_CH_
 
-  class TAO_Export RelativeRoundtripTimeoutPolicy_var
+  class TAO_Export RelativeRoundtripTimeoutPolicy_var : public TAO_Base_var
   {
   public:
     RelativeRoundtripTimeoutPolicy_var (void); // default constructor
@@ -1313,6 +1340,9 @@ class TAO_Export RelativeRequestTimeoutPolicy: public virtual CORBA::Policy
 
   private:
     RelativeRoundtripTimeoutPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    RelativeRoundtripTimeoutPolicy_var (const TAO_Base_var &rhs);
+    RelativeRoundtripTimeoutPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -1463,7 +1493,7 @@ class TAO_Export RelativeRoundtripTimeoutPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_ROUTINGPOLICY___VAR_CH_)
 #define _MESSAGING_ROUTINGPOLICY___VAR_CH_
 
-  class TAO_Export RoutingPolicy_var
+  class TAO_Export RoutingPolicy_var : public TAO_Base_var
   {
   public:
     RoutingPolicy_var (void); // default constructor
@@ -1486,6 +1516,9 @@ class TAO_Export RelativeRoundtripTimeoutPolicy: public virtual CORBA::Policy
 
   private:
     RoutingPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    RoutingPolicy_var (const TAO_Base_var &rhs);
+    RoutingPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -1586,7 +1619,7 @@ class TAO_Export RoutingPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_MAXHOPSPOLICY___VAR_CH_)
 #define _MESSAGING_MAXHOPSPOLICY___VAR_CH_
 
-  class TAO_Export MaxHopsPolicy_var
+  class TAO_Export MaxHopsPolicy_var : public TAO_Base_var
   {
   public:
     MaxHopsPolicy_var (void); // default constructor
@@ -1609,6 +1642,9 @@ class TAO_Export RoutingPolicy: public virtual CORBA::Policy
 
   private:
     MaxHopsPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    MaxHopsPolicy_var (const TAO_Base_var &rhs);
+    MaxHopsPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -1709,7 +1745,7 @@ class TAO_Export MaxHopsPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_QUEUEORDERPOLICY___VAR_CH_)
 #define _MESSAGING_QUEUEORDERPOLICY___VAR_CH_
 
-  class TAO_Export QueueOrderPolicy_var
+  class TAO_Export QueueOrderPolicy_var : public TAO_Base_var
   {
   public:
     QueueOrderPolicy_var (void); // default constructor
@@ -1732,6 +1768,9 @@ class TAO_Export MaxHopsPolicy: public virtual CORBA::Policy
 
   private:
     QueueOrderPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    QueueOrderPolicy_var (const TAO_Base_var &rhs);
+    QueueOrderPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -2417,7 +2456,7 @@ class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy
 #if !defined (_MESSAGING_REPLYHANDLER___VAR_CH_)
 #define _MESSAGING_REPLYHANDLER___VAR_CH_
 
-  class TAO_Export ReplyHandler_var
+  class TAO_Export ReplyHandler_var : public TAO_Base_var
   {
   public:
     ReplyHandler_var (void); // default constructor
@@ -2440,6 +2479,9 @@ class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy
 
   private:
     ReplyHandler_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ReplyHandler_var (const TAO_Base_var &rhs);
+    ReplyHandler_var &operator= (const TAO_Base_var &rhs);
   };
 
 
diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i
index c4a41db6931..1ec978bc053 100644
--- a/TAO/tao/MessagingC.i
+++ b/TAO/tao/MessagingC.i
@@ -43,7 +43,8 @@ Messaging::RebindPolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::RebindPolicy_var::RebindPolicy_var (const ::Messaging::RebindPolicy_var &p) // copy constructor
-  : ptr_ (RebindPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (RebindPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -229,7 +230,8 @@ Messaging::SyncScopePolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::SyncScopePolicy_var::SyncScopePolicy_var (const ::Messaging::SyncScopePolicy_var &p) // copy constructor
-  : ptr_ (SyncScopePolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (SyncScopePolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -543,7 +545,8 @@ Messaging::RequestPriorityPolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (const ::Messaging::RequestPriorityPolicy_var &p) // copy constructor
-  : ptr_ (RequestPriorityPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (RequestPriorityPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -725,7 +728,8 @@ Messaging::ReplyPriorityPolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (const ::Messaging::ReplyPriorityPolicy_var &p) // copy constructor
-  : ptr_ (ReplyPriorityPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (ReplyPriorityPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -911,7 +915,8 @@ Messaging::RequestStartTimePolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (const ::Messaging::RequestStartTimePolicy_var &p) // copy constructor
-  : ptr_ (RequestStartTimePolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (RequestStartTimePolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1097,7 +1102,8 @@ Messaging::RequestEndTimePolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (const ::Messaging::RequestEndTimePolicy_var &p) // copy constructor
-  : ptr_ (RequestEndTimePolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (RequestEndTimePolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1283,7 +1289,8 @@ Messaging::ReplyStartTimePolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (const ::Messaging::ReplyStartTimePolicy_var &p) // copy constructor
-  : ptr_ (ReplyStartTimePolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (ReplyStartTimePolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1469,7 +1476,8 @@ Messaging::ReplyEndTimePolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (const ::Messaging::ReplyEndTimePolicy_var &p) // copy constructor
-  : ptr_ (ReplyEndTimePolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (ReplyEndTimePolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1655,7 +1663,8 @@ Messaging::RelativeRequestTimeoutPolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (const ::Messaging::RelativeRequestTimeoutPolicy_var &p) // copy constructor
-  : ptr_ (RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1841,7 +1850,8 @@ Messaging::RelativeRoundtripTimeoutPolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p) // copy constructor
-  : ptr_ (RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -2155,7 +2165,8 @@ Messaging::RoutingPolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::RoutingPolicy_var::RoutingPolicy_var (const ::Messaging::RoutingPolicy_var &p) // copy constructor
-  : ptr_ (RoutingPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (RoutingPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -2341,7 +2352,8 @@ Messaging::MaxHopsPolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (const ::Messaging::MaxHopsPolicy_var &p) // copy constructor
-  : ptr_ (MaxHopsPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (MaxHopsPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -2527,7 +2539,8 @@ Messaging::QueueOrderPolicy_var::ptr (void) const
 
 ACE_INLINE
 Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (const ::Messaging::QueueOrderPolicy_var &p) // copy constructor
-  : ptr_ (QueueOrderPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (QueueOrderPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -3877,7 +3890,8 @@ Messaging::ReplyHandler_var::ptr (void) const
 
 ACE_INLINE
 Messaging::ReplyHandler_var::ReplyHandler_var (const ::Messaging::ReplyHandler_var &p) // copy constructor
-  : ptr_ (ReplyHandler::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (ReplyHandler::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index 87641bc86a7..babf8cf69a0 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -73,7 +73,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA___VAR_CH_)
 #define _PORTABLESERVER_POA___VAR_CH_
 
-  class TAO_Export POA_var
+  class TAO_Export POA_var : public TAO_Base_var
   {
   public:
     POA_var (void); // default constructor
@@ -96,6 +96,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     POA_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    POA_var (const TAO_Base_var &rhs);
+    POA_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -280,7 +283,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CH_)
 #define _PORTABLESERVER_THREADPOLICY___VAR_CH_
 
-  class TAO_Export ThreadPolicy_var
+  class TAO_Export ThreadPolicy_var : public TAO_Base_var
   {
   public:
     ThreadPolicy_var (void); // default constructor
@@ -303,6 +306,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     ThreadPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ThreadPolicy_var (const TAO_Base_var &rhs);
+    ThreadPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -390,7 +396,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY___VAR_CH_
 
-  class TAO_Export LifespanPolicy_var
+  class TAO_Export LifespanPolicy_var : public TAO_Base_var
   {
   public:
     LifespanPolicy_var (void); // default constructor
@@ -413,6 +419,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     LifespanPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    LifespanPolicy_var (const TAO_Base_var &rhs);
+    LifespanPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -500,7 +509,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_
 
-  class TAO_Export IdUniquenessPolicy_var
+  class TAO_Export IdUniquenessPolicy_var : public TAO_Base_var
   {
   public:
     IdUniquenessPolicy_var (void); // default constructor
@@ -523,6 +532,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     IdUniquenessPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    IdUniquenessPolicy_var (const TAO_Base_var &rhs);
+    IdUniquenessPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -610,7 +622,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_
 
-  class TAO_Export IdAssignmentPolicy_var
+  class TAO_Export IdAssignmentPolicy_var : public TAO_Base_var
   {
   public:
     IdAssignmentPolicy_var (void); // default constructor
@@ -633,6 +645,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     IdAssignmentPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    IdAssignmentPolicy_var (const TAO_Base_var &rhs);
+    IdAssignmentPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -723,7 +738,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_
 
-  class TAO_Export ImplicitActivationPolicy_var
+  class TAO_Export ImplicitActivationPolicy_var : public TAO_Base_var
   {
   public:
     ImplicitActivationPolicy_var (void); // default constructor
@@ -746,6 +761,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     ImplicitActivationPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ImplicitActivationPolicy_var (const TAO_Base_var &rhs);
+    ImplicitActivationPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -838,7 +856,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_
 
-  class TAO_Export ServantRetentionPolicy_var
+  class TAO_Export ServantRetentionPolicy_var : public TAO_Base_var
   {
   public:
     ServantRetentionPolicy_var (void); // default constructor
@@ -861,6 +879,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     ServantRetentionPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ServantRetentionPolicy_var (const TAO_Base_var &rhs);
+    ServantRetentionPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -954,7 +975,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_
 
-  class TAO_Export RequestProcessingPolicy_var
+  class TAO_Export RequestProcessingPolicy_var : public TAO_Base_var
   {
   public:
     RequestProcessingPolicy_var (void); // default constructor
@@ -977,6 +998,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     RequestProcessingPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    RequestProcessingPolicy_var (const TAO_Base_var &rhs);
+    RequestProcessingPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -1057,7 +1081,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POAMANAGER___VAR_CH_)
 #define _PORTABLESERVER_POAMANAGER___VAR_CH_
 
-  class TAO_Export POAManager_var
+  class TAO_Export POAManager_var : public TAO_Base_var
   {
   public:
     POAManager_var (void); // default constructor
@@ -1080,6 +1104,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     POAManager_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    POAManager_var (const TAO_Base_var &rhs);
+    POAManager_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -1206,7 +1233,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_
 
-  class TAO_Export AdapterActivator_var
+  class TAO_Export AdapterActivator_var : public TAO_Base_var
   {
   public:
     AdapterActivator_var (void); // default constructor
@@ -1229,6 +1256,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     AdapterActivator_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    AdapterActivator_var (const TAO_Base_var &rhs);
+    AdapterActivator_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -1304,7 +1334,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER___VAR_CH_
 
-  class TAO_Export ServantManager_var
+  class TAO_Export ServantManager_var : public TAO_Base_var
   {
   public:
     ServantManager_var (void); // default constructor
@@ -1327,6 +1357,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     ServantManager_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ServantManager_var (const TAO_Base_var &rhs);
+    ServantManager_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -1402,7 +1435,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_
 
-  class TAO_Export ServantActivator_var
+  class TAO_Export ServantActivator_var : public TAO_Base_var
   {
   public:
     ServantActivator_var (void); // default constructor
@@ -1425,6 +1458,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     ServantActivator_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ServantActivator_var (const TAO_Base_var &rhs);
+    ServantActivator_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -1501,7 +1537,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR___VAR_CH_
 
-  class TAO_Export ServantLocator_var
+  class TAO_Export ServantLocator_var : public TAO_Base_var
   {
   public:
     ServantLocator_var (void); // default constructor
@@ -1524,6 +1560,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     ServantLocator_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ServantLocator_var (const TAO_Base_var &rhs);
+    ServantLocator_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -1604,7 +1643,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA___VAR_CH_)
 #define _PORTABLESERVER_POA___VAR_CH_
 
-  class TAO_Export POA_var
+  class TAO_Export POA_var : public TAO_Base_var
   {
   public:
     POA_var (void); // default constructor
@@ -1627,6 +1666,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     POA_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    POA_var (const TAO_Base_var &rhs);
+    POA_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
@@ -2123,7 +2165,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_CURRENT___VAR_CH_)
 #define _PORTABLESERVER_CURRENT___VAR_CH_
 
-  class TAO_Export Current_var
+  class TAO_Export Current_var : public TAO_Base_var
   {
   public:
     Current_var (void); // default constructor
@@ -2146,6 +2188,9 @@ TAO_NAMESPACE PortableServer{
 
   private:
     Current_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    Current_var (const TAO_Base_var &rhs);
+    Current_var &operator= (const TAO_Base_var &rhs);
   };
 
 #endif /* end #if !defined */
diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i
index cfdfdd46370..e32f866887d 100644
--- a/TAO/tao/POAC.i
+++ b/TAO/tao/POAC.i
@@ -39,7 +39,8 @@ PortableServer::POA_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::POA_var::POA_var (const PortableServer::POA_var &p) // copy constructor
-  : ptr_ (PortableServer::POA::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::POA::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -432,7 +433,8 @@ PortableServer::ThreadPolicy_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::ThreadPolicy_var::ThreadPolicy_var (const PortableServer::ThreadPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::ThreadPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::ThreadPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -626,7 +628,8 @@ PortableServer::LifespanPolicy_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::LifespanPolicy_var::LifespanPolicy_var (const PortableServer::LifespanPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::LifespanPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::LifespanPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -819,7 +822,8 @@ PortableServer::IdUniquenessPolicy_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (const PortableServer::IdUniquenessPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1012,7 +1016,8 @@ PortableServer::IdAssignmentPolicy_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (const PortableServer::IdAssignmentPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1207,7 +1212,8 @@ PortableServer::ImplicitActivationPolicy_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (const PortableServer::ImplicitActivationPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1400,7 +1406,8 @@ PortableServer::ServantRetentionPolicy_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (const PortableServer::ServantRetentionPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1593,7 +1600,8 @@ PortableServer::RequestProcessingPolicy_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (const PortableServer::RequestProcessingPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1788,7 +1796,8 @@ PortableServer::POAManager_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::POAManager_var::POAManager_var (const PortableServer::POAManager_var &p) // copy constructor
-  : ptr_ (PortableServer::POAManager::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::POAManager::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -1983,7 +1992,8 @@ PortableServer::AdapterActivator_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::AdapterActivator_var::AdapterActivator_var (const PortableServer::AdapterActivator_var &p) // copy constructor
-  : ptr_ (PortableServer::AdapterActivator::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::AdapterActivator::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -2176,7 +2186,8 @@ PortableServer::ServantManager_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::ServantManager_var::ServantManager_var (const PortableServer::ServantManager_var &p) // copy constructor
-  : ptr_ (PortableServer::ServantManager::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::ServantManager::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -2369,7 +2380,8 @@ PortableServer::ServantActivator_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::ServantActivator_var::ServantActivator_var (const PortableServer::ServantActivator_var &p) // copy constructor
-  : ptr_ (PortableServer::ServantActivator::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::ServantActivator::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -2562,7 +2574,8 @@ PortableServer::ServantLocator_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::ServantLocator_var::ServantLocator_var (const PortableServer::ServantLocator_var &p) // copy constructor
-  : ptr_ (PortableServer::ServantLocator::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::ServantLocator::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -2751,7 +2764,8 @@ PortableServer::POA_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::POA_var::POA_var (const PortableServer::POA_var &p) // copy constructor
-  : ptr_ (PortableServer::POA::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::POA::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -2944,7 +2958,8 @@ PortableServer::Current_var::ptr (void) const
 
 ACE_INLINE
 PortableServer::Current_var::Current_var (const PortableServer::Current_var &p) // copy constructor
-  : ptr_ (PortableServer::Current::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (PortableServer::Current::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 4baf93342cf..b10c90ef805 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -104,7 +104,7 @@ public:
 class CORBA_Policy;
 typedef CORBA_Policy *CORBA_Policy_ptr;
 
-class TAO_Export  CORBA_Policy_var
+class TAO_Export  CORBA_Policy_var : public TAO_Base_var
 {
 public:
   CORBA_Policy_var (void); // default constructor
@@ -127,6 +127,9 @@ public:
 
 private:
   CORBA_Policy_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_Policy_var (const TAO_Base_var &rhs);
+  CORBA_Policy_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export  CORBA_Policy_out
@@ -359,7 +362,7 @@ private:
   void operator= (const CORBA_PolicyTypeSeq_var &);
 };
 
-class TAO_Export CORBA_PolicyManager_var
+class TAO_Export CORBA_PolicyManager_var : public TAO_Base_var
 {
 public:
   CORBA_PolicyManager_var (void); // default constructor
@@ -382,6 +385,9 @@ public:
 
 private:
   CORBA_PolicyManager_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_PolicyManager_var (const TAO_Base_var &rhs);
+  CORBA_PolicyManager_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export CORBA_PolicyManager_out
@@ -450,7 +456,7 @@ private:
 
 // ****************************************************************
 
-class TAO_Export CORBA_PolicyCurrent_var
+class TAO_Export CORBA_PolicyCurrent_var : public TAO_Base_var
 {
 public:
   CORBA_PolicyCurrent_var (void); // default constructor
@@ -473,6 +479,9 @@ public:
 
 private:
   CORBA_PolicyCurrent_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_PolicyCurrent_var (const TAO_Base_var &rhs);
+  CORBA_PolicyCurrent_var &operator= (const TAO_Base_var &rhs);
 };
 
 class TAO_Export CORBA_PolicyCurrent_out
diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i
index c06933799c7..074bf947f83 100644
--- a/TAO/tao/PolicyC.i
+++ b/TAO/tao/PolicyC.i
@@ -85,7 +85,8 @@ CORBA_Policy_var::ptr (void) const
 // copy constructor
 ACE_INLINE
 CORBA_Policy_var::CORBA_Policy_var (const CORBA_Policy_var &p)
-  : ptr_ (CORBA_Policy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_Policy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -642,7 +643,8 @@ CORBA_PolicyManager_var::ptr (void) const
 
 ACE_INLINE
 CORBA_PolicyManager_var::CORBA_PolicyManager_var (const CORBA_PolicyManager_var &p) // copy constructor
-  : ptr_ (CORBA_PolicyManager::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_PolicyManager::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -831,7 +833,8 @@ CORBA_PolicyCurrent_var::ptr (void) const
 
 ACE_INLINE
 CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (const CORBA_PolicyCurrent_var &p) // copy constructor
-  : ptr_ (CORBA_PolicyCurrent::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_PolicyCurrent::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index 9af51c1c1cc..d4abfe0fac9 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -56,7 +56,7 @@ typedef CORBA_PollableSet *CORBA_PollableSet_ptr;
 #if !defined (_CORBA_POLLABLESET___VAR_CH_)
 #define _CORBA_POLLABLESET___VAR_CH_
 
-class TAO_Export CORBA_PollableSet_var
+class TAO_Export CORBA_PollableSet_var : public TAO_Base_var
 {
 public:
   CORBA_PollableSet_var (void); // default constructor
@@ -79,6 +79,9 @@ public:
 
 private:
   CORBA_PollableSet_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_PollableSet_var (const TAO_Base_var &rhs);
+  CORBA_PollableSet_var &operator= (const TAO_Base_var &rhs);
 };
 
 
@@ -121,7 +124,7 @@ typedef CORBA_Pollable *CORBA_Pollable_ptr;
 #if !defined (_CORBA_POLLABLE___VAR_CH_)
 #define _CORBA_POLLABLE___VAR_CH_
 
-class TAO_Export CORBA_Pollable_var
+class TAO_Export CORBA_Pollable_var : public TAO_Base_var
 {
 public:
   CORBA_Pollable_var (void); // default constructor
@@ -144,6 +147,9 @@ public:
 
 private:
   CORBA_Pollable_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_Pollable_var (const TAO_Base_var &rhs);
+  CORBA_Pollable_var &operator= (const TAO_Base_var &rhs);
 };
 
 
@@ -247,7 +253,7 @@ typedef CORBA_DIIPollable *CORBA_DIIPollable_ptr;
 #if !defined (_CORBA_DIIPOLLABLE___VAR_CH_)
 #define _CORBA_DIIPOLLABLE___VAR_CH_
 
-class TAO_Export CORBA_DIIPollable_var
+class TAO_Export CORBA_DIIPollable_var : public TAO_Base_var
 {
 public:
   CORBA_DIIPollable_var (void); // default constructor
@@ -270,6 +276,9 @@ public:
 
 private:
   CORBA_DIIPollable_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_DIIPollable_var (const TAO_Base_var &rhs);
+  CORBA_DIIPollable_var &operator= (const TAO_Base_var &rhs);
 };
 
 
@@ -356,7 +365,7 @@ typedef CORBA_PollableSet *CORBA_PollableSet_ptr;
 #if !defined (_CORBA_POLLABLESET___VAR_CH_)
 #define _CORBA_POLLABLESET___VAR_CH_
 
-class TAO_Export CORBA_PollableSet_var
+class TAO_Export CORBA_PollableSet_var : public TAO_Base_var
 {
 public:
   CORBA_PollableSet_var (void); // default constructor
@@ -379,6 +388,9 @@ public:
 
 private:
   CORBA_PollableSet_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_PollableSet_var (const TAO_Base_var &rhs);
+  CORBA_PollableSet_var &operator= (const TAO_Base_var &rhs);
 };
 
 
diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i
index 3a67d2abcb0..9525b7375d8 100644
--- a/TAO/tao/PollableC.i
+++ b/TAO/tao/PollableC.i
@@ -41,7 +41,8 @@ CORBA_Pollable_var::ptr (void) const
 
 ACE_INLINE
 CORBA_Pollable_var::CORBA_Pollable_var (const ::CORBA_Pollable_var &p) // copy constructor
-  : ptr_ (CORBA_Pollable::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_Pollable::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -223,7 +224,8 @@ CORBA_DIIPollable_var::ptr (void) const
 
 ACE_INLINE
 CORBA_DIIPollable_var::CORBA_DIIPollable_var (const ::CORBA_DIIPollable_var &p) // copy constructor
-  : ptr_ (CORBA_DIIPollable::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_DIIPollable::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -405,7 +407,8 @@ CORBA_PollableSet_var::ptr (void) const
 
 ACE_INLINE
 CORBA_PollableSet_var::CORBA_PollableSet_var (const ::CORBA_PollableSet_var &p) // copy constructor
-  : ptr_ (CORBA_PollableSet::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (CORBA_PollableSet::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 2e6f05a734c..1b9cb32ac08 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -3666,6 +3666,10 @@ SOURCE=.\ValueFactory_Map.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\varbase.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Wait_Strategy.h

 # End Source File

 # Begin Source File

@@ -3726,6 +3730,10 @@ SOURCE=.\corbafwd.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\CurrentC.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\default_client.i

 # End Source File

 # Begin Source File

@@ -3914,6 +3922,10 @@ SOURCE=.\PolicyC.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\PollableC.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Pool_Per_Endpoint.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index a5f78109699..89180b274b1 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -126,7 +126,7 @@ TAO_NAMESPACE  TAO
 #if !defined (_TAO_CLIENTPRIORITYPOLICY___VAR_CH_)
 #define _TAO_CLIENTPRIORITYPOLICY___VAR_CH_
 
-  class TAO_Export ClientPriorityPolicy_var
+  class TAO_Export ClientPriorityPolicy_var : public TAO_Base_var
   {
   public:
     ClientPriorityPolicy_var (void); // default constructor
@@ -149,6 +149,9 @@ TAO_NAMESPACE  TAO
 
   private:
     ClientPriorityPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ClientPriorityPolicy_var (const TAO_Base_var &rhs);
+    ClientPriorityPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
@@ -313,7 +316,7 @@ class TAO_Export ClientPriorityPolicy: public virtual CORBA::Policy
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___VAR_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY___VAR_CH_
 
-  class TAO_Export BufferingConstraintPolicy_var
+  class TAO_Export BufferingConstraintPolicy_var : public TAO_Base_var
   {
   public:
     BufferingConstraintPolicy_var (void); // default constructor
@@ -336,6 +339,9 @@ class TAO_Export ClientPriorityPolicy: public virtual CORBA::Policy
 
   private:
     BufferingConstraintPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    BufferingConstraintPolicy_var (const TAO_Base_var &rhs);
+    BufferingConstraintPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i
index 8d3d4543bc7..96401ebbe2d 100644
--- a/TAO/tao/TAOC.i
+++ b/TAO/tao/TAOC.i
@@ -171,7 +171,8 @@ TAO::ClientPriorityPolicy_var::ptr (void) const
 
 ACE_INLINE
 TAO::ClientPriorityPolicy_var::ClientPriorityPolicy_var (const ::TAO::ClientPriorityPolicy_var &p) // copy constructor
-  : ptr_ (ClientPriorityPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (ClientPriorityPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -485,7 +486,8 @@ TAO::BufferingConstraintPolicy_var::ptr (void) const
 
 ACE_INLINE
 TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (const ::TAO::BufferingConstraintPolicy_var &p) // copy constructor
-  : ptr_ (BufferingConstraintPolicy::_duplicate (p.ptr ()))
+  : TAO_Base_var (),
+    ptr_ (BufferingConstraintPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 433ea725413..8023760c069 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -1255,6 +1255,10 @@ SOURCE=.\ValueFactory_Map.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\varbase.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Wait_Strategy.h

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index f0dd46e6aeb..f5da2576ca6 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -37,6 +37,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/try_macros.h"
+#include "tao/varbase.h"
 
 #if !defined (TAO_HAS_DLL)
 // On Windows NT, the default is to build TAO as a DLL library.
diff --git a/TAO/tao/varbase.h b/TAO/tao/varbase.h
new file mode 100644
index 00000000000..6e6f2fd4e74
--- /dev/null
+++ b/TAO/tao/varbase.h
@@ -0,0 +1,41 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//     TAO
+//
+// = FILENAME
+//     varbase.h
+//
+// = DESCRIPTION
+//     Contains a base class for the object _var classes. 
+//
+// = AUTHOR
+//     Jeff Parsons.
+//
+// ============================================================================
+
+#ifndef TAO_VARBASE_H
+#define TAO_VARBASE_H
+#include "ace/pre.h"
+
+class TAO_Base_var
+{
+//
+// = TITLE
+//     TAO_Base_var
+//
+// = DESCRIPTION
+//     Base class for object _var classes. Used to prevent the
+//     _var class of a CORBA interface from accepting the _var
+//     of a more derived interface in its copy constructor or
+//     assignment operator.
+//
+public:
+  TAO_Base_var (void) {}
+};
+
+#include "ace/post.h"
+#endif /* TAO_VARBASE_H */