diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-02 20:35:30 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-02 20:35:30 +0000 |
| commit | ff464bc1424547987f2b9ad7a51cfa20eea8e30c (patch) | |
| tree | 99a44fc61e2d72a2ee58d49b8e071fc174bbde14 | |
| parent | b5d77caf3e2fbc1fdca7e8372f69299446be5bca (diff) | |
| download | ATCD-ff464bc1424547987f2b9ad7a51cfa20eea8e30c.tar.gz | |
ChangeLogTag: Tue Nov 2 12:28:47 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FT_CORBA.idl | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index dc8016d2600..accc6b9a7e8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,16 +1,23 @@ +Tue Nov 2 12:28:47 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/orbvcs/FT_CORBA.idl: + + Changed "orbsvcs/orbsvcs/" #include path prefix to "orbsvcs/". + Was missed in earlier refactor. + Tue Nov 2 12:23:20 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_interface.cpp: * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: * TAO_IDL/be/be_visitor_operation/operation_ch.cpp: - + - Fixed a bug that occurs when a local interface inherits from one or more abstract interfaces with operations. The inherited operations were getting generated twice, once without being pure virtual as required for local interfaces. - + - Removed generation of the function pointer for collocation factory initialization when we have a local interface, since it's not relevant in that case. diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl index e9529e48959..144c2290bbe 100644 --- a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl +++ b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl @@ -16,7 +16,7 @@ #define FT_USES_PORTABLE_GROUP #ifdef FT_USES_PORTABLE_GROUP -# include "orbsvcs/orbsvcs/PortableGroup.idl" +# include "orbsvcs/PortableGroup.idl" #else // FT_USES_PORTABLE_GROUP #include "orbsvcs/CosNaming.idl" // 98-10-19.idl #endif // FT_USES_PORTABLE_GROUP |