summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-07-26 21:25:47 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-07-26 21:25:47 +0000
commit201898425c0c2abb47ec12e18f2a1d0d2d745747 (patch)
tree98b6b921eeb5af85b52accbe1f39705b4f47a7ee
parentd64c55bd03e1c510d19481d930b61d7334e6e272 (diff)
downloadATCD-201898425c0c2abb47ec12e18f2a1d0d2d745747.tar.gz
ChangeLogTag: Tue Jul 26 21:22:45 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/CIAO/ChangeLog9
-rw-r--r--TAO/CIAO/DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h2
2 files changed, 10 insertions, 1 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 6c119ee678b..ce9a2b640a6 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jul 26 21:22:45 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h:
+
+ Added 'CIDL_' prefix to the scoped name of the exec impl class's
+ base class, in the impl class declaration inheritance list. This
+ file was overlooked when making similar changes to other exec
+ impl classes in CIAO tests and examples.
+
Mon Jul 26 13:54:12 2005 Ming Xiong <mxiong@dre.vanderbilt.edu>
* docs/schema/cid.xsd
diff --git a/TAO/CIAO/DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h b/TAO/CIAO/DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
index 5339c67f2e6..b2528ba62b7 100644
--- a/TAO/CIAO/DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
+++ b/TAO/CIAO/DAnCE/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
@@ -29,7 +29,7 @@ namespace MyImpl
* RateGen executor implementation class.
*/
class NAVDISPLAY_EXEC_Export NavDisplayGUI_exec_impl :
- public virtual NavDisplay_Impl::NavDisplay_exec,
+ public virtual CIDL_NavDisplay_Impl::NavDisplay_exec,
public virtual TAO_Local_RefCounted_Object
{
public: