summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-03-28 17:49:25 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-03-28 17:49:25 +0000
commit88e6316e4abaecab9afe77a3a315db897f6db5ee (patch)
tree02fafe4754a4871b7a94aea7fe1ee8a81b329d49
parent3cf683aa90cfe624a50b333c856a290b5d7fe49d (diff)
downloadATCD-88e6316e4abaecab9afe77a3a315db897f6db5ee.tar.gz
ChangeLogTag:Wed Mar 28 09:45:30 2001 Carlos O'Ryan <coryan@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a6
-rw-r--r--TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp3
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 08d126b25db..41fd129cd49 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Wed Mar 28 09:45:30 2001 Carlos O'Ryan <coryan@uci.edu>
+
+ * orbsvcs/Naming_Service/NT_Naming_Service.cpp:
+ Borland uses the standard scope rules for variables declared
+ inside for() statements, MSVC is more forgiving.
+
Wed Mar 28 09:31:54 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
* performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index c178c867a41..5d412224ced 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -98,7 +98,8 @@ TAO_NT_Naming_Service::init (int argc,
argv_save_ = (char **) ACE_OS::malloc (sizeof (char *) * (argc + args.argc ()));
// Copy the values into the internal args buffer.
- for (int i = 0; i < argc; i++)
+ int i;
+ for (i = 0; i < argc; i++)
argv_save_[i] = ACE_OS::strdup (argv[i]);
int j = 0;