ChangeLogTag:Mon Jan 31 00:09:11 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>

8 files changed, 68 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 87971f390b6..eab81d40eb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Mon Jan 31 00:09:11 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* etc/Svc_Conf_l.cpp.diff: The context diff was incorrectly
+	  written, therefore, the wrong ACE_YY_BREAK was being commented
+ 	  out.  This is now fixed.  Thanks to David Levine for reporting
+ 	  this.
+
+	* examples/Shared_Malloc/test_position_independent_malloc.cpp: 
+	  Added a typedef to handle cases where
+ 	  ACE_HAS_POSITION_INDEPENDENT_MALLOC is not set.  Thanks to David
+ 	  Levine for reporting this.
+
+	* examples/Service_Configurator/Misc/main.cpp (main): Changed
+	  int i to size_t i to avoid complaint about signed/unsigned
+ 	  mismatch.  Thanks to David Levine for reporting this.
+
 Sun Jan 30 12:35:20 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ace/Token.cpp (remove_entry): <tail_> should point to <prev>
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 87971f390b6..eab81d40eb5 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Mon Jan 31 00:09:11 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* etc/Svc_Conf_l.cpp.diff: The context diff was incorrectly
+	  written, therefore, the wrong ACE_YY_BREAK was being commented
+ 	  out.  This is now fixed.  Thanks to David Levine for reporting
+ 	  this.
+
+	* examples/Shared_Malloc/test_position_independent_malloc.cpp: 
+	  Added a typedef to handle cases where
+ 	  ACE_HAS_POSITION_INDEPENDENT_MALLOC is not set.  Thanks to David
+ 	  Levine for reporting this.
+
+	* examples/Service_Configurator/Misc/main.cpp (main): Changed
+	  int i to size_t i to avoid complaint about signed/unsigned
+ 	  mismatch.  Thanks to David Levine for reporting this.
+
 Sun Jan 30 12:35:20 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ace/Token.cpp (remove_entry): <tail_> should point to <prev>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 87971f390b6..eab81d40eb5 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,19 @@
+Mon Jan 31 00:09:11 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* etc/Svc_Conf_l.cpp.diff: The context diff was incorrectly
+	  written, therefore, the wrong ACE_YY_BREAK was being commented
+ 	  out.  This is now fixed.  Thanks to David Levine for reporting
+ 	  this.
+
+	* examples/Shared_Malloc/test_position_independent_malloc.cpp: 
+	  Added a typedef to handle cases where
+ 	  ACE_HAS_POSITION_INDEPENDENT_MALLOC is not set.  Thanks to David
+ 	  Levine for reporting this.
+
+	* examples/Service_Configurator/Misc/main.cpp (main): Changed
+	  int i to size_t i to avoid complaint about signed/unsigned
+ 	  mismatch.  Thanks to David Levine for reporting this.
+
 Sun Jan 30 12:35:20 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ace/Token.cpp (remove_entry): <tail_> should point to <prev>
diff --git a/ace/OS.i b/ace/OS.i
index c1968998639..6a97db95480 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -11029,14 +11029,13 @@ ACE_OS::mkdir (const char *path, mode_t mode)
 
   phile_path = (char *)ACE_OS::malloc(strlen(path));
   if (phile_path == 0)
-  {
-     ACE_OS::printf ("malloc in make_dir failed: [%X]\n", errno);
-     return -1;
-  }
+    {
+      ACE_OS::printf ("malloc in make_dir failed: [%X]\n",
+                      errno);
+      return -1;
+    }
   else
-  {
-     ACE_OS::strcpy (phile_path, path);
-  }
+    ACE_OS::strcpy (phile_path, path);
 
   location = ACE_OS::strlen(phile_path);
   if(phile_path[location-1] == '/')
diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp
index 216569a505a..17746c29784 100644
--- a/ace/Svc_Conf_l.cpp
+++ b/ace/Svc_Conf_l.cpp
@@ -923,12 +923,12 @@ case ACE_YY_STATE_EOF(PARAMETERS):
 case ACE_YY_STATE_EOF(NORMAL):
 #line 89 "Svc_Conf.l"
 { ACE_YY_NEW_FILE; ace_yyterminate(); }
-	ACE_YY_BREAK
+//	ACE_YY_BREAK
 case 25:
 ACE_YY_RULE_SETUP
 #line 90 "Svc_Conf.l"
 ACE_SVC_CONF_ECHO;
-//	ACE_YY_BREAK
+	ACE_YY_BREAK
 
 	case ACE_YY_END_OF_BUFFER:
 		{
diff --git a/etc/Svc_Conf_l.cpp.diff b/etc/Svc_Conf_l.cpp.diff
index 8af389465f5..3b76231d462 100644
--- a/etc/Svc_Conf_l.cpp.diff
+++ b/etc/Svc_Conf_l.cpp.diff
@@ -205,10 +205,10 @@
   case 22:
 ***************
 *** 925,927 ****
-  		      }
+  { ACE_YY_NEW_FILE; ace_yyterminate(); }
 ! 	ACE_YY_BREAK
   case 25:
 --- 925,927 ----
-  		      }
+  { ACE_YY_NEW_FILE; ace_yyterminate(); }
 ! //	ACE_YY_BREAK
   case 25:
diff --git a/examples/Service_Configurator/Misc/main.cpp b/examples/Service_Configurator/Misc/main.cpp
index 3751cbd3a8b..13fc9101921 100644
--- a/examples/Service_Configurator/Misc/main.cpp
+++ b/examples/Service_Configurator/Misc/main.cpp
@@ -54,7 +54,7 @@ main (int, ASYS_TCHAR *argv[])
               ASYS_TEXT (args.argc ())));
 
   // Print the contents of the combined <ACE_ARGV>.
-  for (int i = 0; i < args.argc (); i++)
+  for (size_t i = 0; i < args.argc (); i++)
     ACE_DEBUG ((LM_DEBUG,
                 ASYS_TEXT ("(%d) %s\n"),
                 i,
diff --git a/examples/Shared_Malloc/test_position_independent_malloc.cpp b/examples/Shared_Malloc/test_position_independent_malloc.cpp
index c3a764b6da2..eae25d1c347 100644
--- a/examples/Shared_Malloc/test_position_independent_malloc.cpp
+++ b/examples/Shared_Malloc/test_position_independent_malloc.cpp
@@ -14,7 +14,13 @@
 
 ACE_RCSID(Shared_Malloc, test_multiple_mallocs, "$Id$")
 
-typedef ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> MALLOC;
+#if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC)
+typedef ACE_PI_Control_Block CONTROL_BLOCK;
+#else
+typedef ACE_Control_Block CONTROL_BLOCK;
+#endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */
+
+typedef ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, CONTROL_BLOCK> MALLOC;
 
 // Default address for memory-mapped files.
 static void *base_addr = ACE_DEFAULT_BASE_ADDR;
@@ -192,7 +198,7 @@ template class ACE_Based_Pointer_Basic<Long_Test>;
 template class ACE_Based_Pointer<Long_Test>;
 template class auto_ptr <MALLOC>;
 template class ACE_Auto_Basic_Ptr<MALLOC>;
-template class ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block>;
+template class ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, CONTROL_BLOCK>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Based_Pointer<Test_Data>
 #pragma instantiate ACE_Based_Pointer_Basic<Test_Data>
@@ -201,5 +207,5 @@ template class ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Con
 #pragma instantiate ACE_Based_Pointer_Basic<Long>
 #pragma instantiate auto_ptr <MALLOC>
 #pragma instantiate ACE_Auto_Basic_Ptr<MALLOC>
-#pragma instantiate ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block>
+#pragma instantiate ACE_Malloc_T <ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, CONTROL_BLOCK>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */