diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-04 10:22:09 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-04 10:22:09 +0000 |
| commit | 8636ad37e0527cf965cfe56e81484087031ff2d1 (patch) | |
| tree | 43edfa66c0a3ad869f75c10307bb16480f5bfc6a | |
| parent | e2f6a1b9cbf977de236a6e3d6eae6c1faea1d66c (diff) | |
| download | ATCD-8636ad37e0527cf965cfe56e81484087031ff2d1.tar.gz | |
ChangeLogTag: Fri Apr 4 10:20:00 UTC 2008 Simon Massey <simon dot massey at prismtech dot com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ce024d04e77..15fe311fb98 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 4 10:20:00 UTC 2008 Simon Massey <simon dot massey at prismtech dot com> + + * orbsvcs/tests/Bug_1630_Regression/testclient.cpp: + + Another "interface" VC8 MFC conflict. + Thu Apr 3 15:15:00 UTC 2008 Simon Massey <simon dot massey at prismtech dot com> * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp: diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp index c7443b34692..a4237f7ccda 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp @@ -39,7 +39,7 @@ int main (int argc, char* argv[]) // CORBA::InterfaceDefSeq baseInterfaces(1) ; baseInterfaces.length(0) ; - CORBA::InterfaceDef_var interface = + CORBA::InterfaceDef_var intface = ifr->create_interface( "IDL:interface865:1.0", "interface865", "1.0", @@ -108,7 +108,7 @@ int main (int argc, char* argv[]) // ACE_DEBUG((LM_DEBUG, ". create_operation\n")); CORBA::OperationDef_var operation = - interface->create_operation( "IDL:interface865/f:1.0", + intface->create_operation( "IDL:interface865/f:1.0", "f", "1.0", voidPrimitive.in(), @@ -204,7 +204,7 @@ int main (int argc, char* argv[]) // Finally destroy the interface. // - interface->destroy() ; + intface->destroy() ; //orb->destroy(); |