summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2003-02-05 08:52:18 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2003-02-05 08:52:18 +0000
commit3b67afae2c4b2e72816a660efdcf2adfe2ebcc76 (patch)
tree095014ee17c4fe49ca09ec6effe29d6632bd5f66
parentdb87f6492513dc7d6b82ca154107d35a9ad499e8 (diff)
downloadATCD-3b67afae2c4b2e72816a660efdcf2adfe2ebcc76.tar.gz
ChangeLogTag: Wed Feb 05 08:49:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Node_Visitor.cpp4
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Scope_Visitor.cpp4
3 files changed, 13 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b231fbf7ee4..6ca43912854 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Feb 5 08:51:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * orbsvcs/PSS/PSDL_Node_Visitor.cpp:
+ * orbsvcs/PSS/PSDL_Scope_Visitor.cpp:
+ Renamed the argument of the visit_interface() method from
+ interface to interf. The MingW compiler has a macro defined
+ interface and this causes problems, so renamed the argument
+ name to fix compile errors with MingW.
+
Tue Feb 4 13:23:51 2003 Krishnakumar B <kitty@cs.wustl.edu>
* tao/Makefile: Fix the Makefile to use the SUBDIR_MAKEFILE
diff --git a/TAO/orbsvcs/PSS/PSDL_Node_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Node_Visitor.cpp
index 203723d0579..5bd628fd5d4 100644
--- a/TAO/orbsvcs/PSS/PSDL_Node_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Node_Visitor.cpp
@@ -459,9 +459,9 @@ TAO_PSDL_Node_Visitor::visit_constr_forward_decl (TAO_PSDL_Constr_Forward_Decl *
}
int
-TAO_PSDL_Node_Visitor::visit_interface (TAO_PSDL_Interface *interface)
+TAO_PSDL_Node_Visitor::visit_interface (TAO_PSDL_Interface *interf)
{
- if (interface->type_of_dcl ()->accept (this) == -1)
+ if (interf->type_of_dcl ()->accept (this) == -1)
return -1;
return 0;
diff --git a/TAO/orbsvcs/PSS/PSDL_Scope_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Scope_Visitor.cpp
index dc5b874a30a..700b70dd62e 100644
--- a/TAO/orbsvcs/PSS/PSDL_Scope_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Scope_Visitor.cpp
@@ -857,9 +857,9 @@ TAO_PSDL_Scope_Visitor::visit_constr_forward_decl (TAO_PSDL_Constr_Forward_Decl
return 0;
}
-int TAO_PSDL_Scope_Visitor::visit_interface (TAO_PSDL_Interface *interface)
+int TAO_PSDL_Scope_Visitor::visit_interface (TAO_PSDL_Interface *interf)
{
- if (interface->type_of_dcl ()->accept (this) == -1)
+ if (interf->type_of_dcl ()->accept (this) == -1)
return -1;
return 0;