diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-03 15:12:37 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-03 15:12:37 +0000 |
| commit | e2f6a1b9cbf977de236a6e3d6eae6c1faea1d66c (patch) | |
| tree | 58bf4d6cada7b48713f0d7197aecfb66b2b65f16 | |
| parent | 62bb62f9fe1b02000a61526236839fe6ddf935ab (diff) | |
| download | ATCD-e2f6a1b9cbf977de236a6e3d6eae6c1faea1d66c.tar.gz | |
ChangeLogTag: Thu Apr 3 15:15:00 UTC 2008 Simon Massey <simon dot massey at prismtech dot com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 905a6946f8c..ce024d04e77 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 3 15:15:00 UTC 2008 Simon Massey <simon dot massey at prismtech dot com> + + * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp: + + Another "interface" VC8 MFC conflict. + Thu Apr 3 09:40:00 UTC 2008 Simon Massey <simon dot massey at prismtech dot com> * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index f3f41ddcd7c..6f978d9d564 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -257,10 +257,10 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_) this->interface_repository_->lookup_id (interface_); // Narrow the interface - CORBA::InterfaceDef_var interface = + CORBA::InterfaceDef_var intface = CORBA::InterfaceDef::_narrow (contained.in ()); - if (CORBA::is_nil (interface.in () )) + if (CORBA::is_nil (intface.in () )) { if (TAO_debug_level >= 10) { @@ -274,7 +274,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_) { // Obtain the full interface description CORBA::InterfaceDef::FullInterfaceDescription_var fid = - interface->describe_interface (); + intface->describe_interface (); // Obtain the base interfaces this->base_interfaces_ = fid->base_interfaces; |