Wed Jul 26 18:08:11 2000 Andrew G. Gilpin <agg1@cs.wustl.edu>

8 files changed, 35 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 05f1e32b325..0fb63269a72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jul 26 18:08:11 2000  Andrew G. Gilpin  <agg1@cs.wustl.edu>
+
+	* ace/Log_Record.cpp
+	* ace/ACE.cpp
+	* ace/Handle_Set.cpp
+	* ace/Capabilities.{cpp, h}
+	  Cosmetic changes required for split-cpp.
+
 Wed Jul 26 13:20:00 2000  Kirthika  Parameswaran  <kirthika@cs.wustl.edu>
 
 	* ace/Cached_Connect_Strategy_T.h
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 05f1e32b325..0fb63269a72 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Wed Jul 26 18:08:11 2000  Andrew G. Gilpin  <agg1@cs.wustl.edu>
+
+	* ace/Log_Record.cpp
+	* ace/ACE.cpp
+	* ace/Handle_Set.cpp
+	* ace/Capabilities.{cpp, h}
+	  Cosmetic changes required for split-cpp.
+
 Wed Jul 26 13:20:00 2000  Kirthika  Parameswaran  <kirthika@cs.wustl.edu>
 
 	* ace/Cached_Connect_Strategy_T.h
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 05f1e32b325..0fb63269a72 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,11 @@
+Wed Jul 26 18:08:11 2000  Andrew G. Gilpin  <agg1@cs.wustl.edu>
+
+	* ace/Log_Record.cpp
+	* ace/ACE.cpp
+	* ace/Handle_Set.cpp
+	* ace/Capabilities.{cpp, h}
+	  Cosmetic changes required for split-cpp.
+
 Wed Jul 26 13:20:00 2000  Kirthika  Parameswaran  <kirthika@cs.wustl.edu>
 
 	* ace/Cached_Connect_Strategy_T.h
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index ee61121f611..967555461c0 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -491,8 +491,7 @@ u_long ACE::crc_table_[] =
   0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, 0x89b8fd09,
   0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
   0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf,
-  0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
-};
+  0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4};
 
 // Compute a POSIX 1003.2 checksum.  The routine takes an string and
 // computes the CRC for it (it stops on the first '\0' character).
diff --git a/ace/Capabilities.cpp b/ace/Capabilities.cpp
index 1afad5c72d4..b3b60403fef 100644
--- a/ace/Capabilities.cpp
+++ b/ace/Capabilities.cpp
@@ -279,7 +279,8 @@ ACE_Capabilities::getval (const ACE_TCHAR *keyname, int &val)
   return 0;
 }
 
-/*static int
+#if !defined (ACE_IS_SPLITTING)
+static int
 is_empty (const ACE_TCHAR *line)
 {
   while (*line && isspace (*line))
@@ -295,7 +296,8 @@ is_line (const ACE_TCHAR *line)
     line++;
 
   return *line != ACE_TEXT ('\0');
-}*/
+}
+#endif /* !ACE_IS_SPLITTING */
 
 int
 ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name)
diff --git a/ace/Capabilities.h b/ace/Capabilities.h
index 4b8298c4553..0384494ff22 100644
--- a/ace/Capabilities.h
+++ b/ace/Capabilities.h
@@ -164,7 +164,8 @@ private:
   // This is the set of ACE_CapEntry.
 };
 
-static int
+#if defined (ACE_IS_SPLITTING)
+int
 is_empty (const ACE_TCHAR *line)
 {
   while (*line && isspace (*line))
@@ -173,7 +174,7 @@ is_empty (const ACE_TCHAR *line)
   return *line == ACE_TEXT ('\0') || *line == ACE_TEXT ('#');
 }
 
-static int
+int
 is_line (const ACE_TCHAR *line)
 {
   while (*line && isspace (*line))
@@ -181,6 +182,7 @@ is_line (const ACE_TCHAR *line)
 
   return *line != ACE_TEXT ('\0');
 }
+#endif /* ACE_IS_SPLITTING */
 
 #if defined (__ACE_INLINE__)
 #include "ace/Capabilities.i"
diff --git a/ace/Handle_Set.cpp b/ace/Handle_Set.cpp
index 0cbe70e82b4..0ba246da386 100644
--- a/ace/Handle_Set.cpp
+++ b/ace/Handle_Set.cpp
@@ -72,8 +72,7 @@ const char ACE_Handle_Set::nbits_[256] =
   2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
   3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
   3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-  4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8,
-};
+  4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8};
 
 // Constructor, initializes the bitmask to all 0s.
 
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index 3c704a70298..fe776004b5a 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -29,8 +29,7 @@ const ACE_TCHAR *ACE_Log_Record::priority_names_[] =
   ACE_TEXT ("LM_ERROR"),
   ACE_TEXT ("LM_CRITICAL"),
   ACE_TEXT ("LM_ALERT"),
-  ACE_TEXT ("LM_EMERGENCY")
-};
+  ACE_TEXT ("LM_EMERGENCY")};
 
 const ACE_TCHAR *
 ACE_Log_Record::priority_name (ACE_Log_Priority p)