Mercurial > ecos

changeset 2116:8286f0e1f4c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix minor cygwin build problem
author bartv
date Mon, 02 Jan 2006 21:14:22 +0000
parents 3e45f460a99e
children 5d7f57fd1729
files host/tools/configtool/standalone/common/ChangeLog host/tools/configtool/standalone/common/cdl_exec.cxx
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/host/tools/configtool/standalone/common/ChangeLog
+++ b/host/tools/configtool/standalone/common/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-16  Bart Veer  <bartv@ecoscentric.com>
+
+	* cdl_exec.cxx (cmd_remove): replace reserved word interface with
+	iface
+
 2005-04-05  Bart Veer  <bartv@ecoscentric.com>
 
 	* cdl_exec.cxx (cmd_remove): check that the entities being removed
--- a/host/tools/configtool/standalone/common/cdl_exec.cxx
+++ b/host/tools/configtool/standalone/common/cdl_exec.cxx
@@ -382,12 +382,12 @@ cdl_exec::cmd_remove (const std::vector<
                 std::string     owner_name  = owner ? owner->get_name() : "<unknown>";
                 CdlOption       option      = dynamic_cast<CdlOption>(base);
                 CdlComponent    component   = dynamic_cast<CdlComponent>(base);
-                CdlInterface    interface   = dynamic_cast<CdlInterface>(base);
+                CdlInterface    iface       = dynamic_cast<CdlInterface>(base);
                 if (0 != option) {
                     throw CdlStringException (cdl_packages [n] + " is an option within " + owner_name + ", not a loadable package");
                 } else if (0 != component) {
                     throw CdlStringException (cdl_packages [n] + " is a component of " + owner_name + ", not a loadable package");
-                } else if (0 != interface) {
+                } else if (0 != iface) {
                     throw CdlStringException (cdl_packages [n] + " is an interface within " + owner_name + ", not a loadable package");
                 } else {
                     throw CdlStringException (cdl_packages [n] + " is not a loadable package");