summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-13 18:35:41 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-13 18:35:41 +0000
commitd4e2287be8e05b421a50eabbbf2daa7a9151d4a3 (patch)
tree010d83534ef300adbf9446b0e8a29624d392f961
parentdf1f724455b1bf39f1050cb42e676afae0b3ce2b (diff)
downloadATCD-d4e2287be8e05b421a50eabbbf2daa7a9151d4a3.tar.gz
changed C++-style comments to C-style comments in preprocessor directives
-rw-r--r--ace/Log_Record.h56
-rw-r--r--ace/OS.h2
2 files changed, 29 insertions, 29 deletions
diff --git a/ace/Log_Record.h b/ace/Log_Record.h
index 1d5883c7f08..61e22125ec1 100644
--- a/ace/Log_Record.h
+++ b/ace/Log_Record.h
@@ -5,13 +5,13 @@
//
// = LIBRARY
// ace
-//
+//
// = FILENAME
// Log_Record.h
//
// = AUTHOR
-// Doug Schmidt
-//
+// Doug Schmidt
+//
// ============================================================================
// These need to go outside of the #ifdef to avoid problems with
@@ -28,13 +28,13 @@ public:
// = TITLE
// Defines the structure of an ACE logging record.
- enum
+ enum
{
MAXLOGMSGLEN = ACE_MAXLOGMSGLEN,
- // Maximum size of a logging message.
+ // Maximum size of a logging message.
- ALIGN_WORDB = 8,
- // Most restrictive alignment.
+ ALIGN_WORDB = 8,
+ // Most restrictive alignment.
VERBOSE_LEN = 128
// Size used by verbose mode.
@@ -44,30 +44,30 @@ public:
// = Initialization
ACE_Log_Record (void);
- ACE_Log_Record (ACE_Log_Priority lp,
- long time_stamp,
- long pid);
+ ACE_Log_Record (ACE_Log_Priority lp,
+ long time_stamp,
+ long pid);
// Create a <Log_Record> and set its priority, time stamp, and
// process id.
- ACE_Log_Record (ACE_Log_Priority lp,
- const ACE_Time_Value &time_stamp,
- long pid);
+ ACE_Log_Record (ACE_Log_Priority lp,
+ const ACE_Time_Value &time_stamp,
+ long pid);
// Create a <Log_Record> and set its priority, time stamp, and
// process id.
~ACE_Log_Record (void);
// Default dtor.
-#if !defined (ACE_HAS_WINCE) // @@ Sould this be ACE_LACKS_IOSTREAM_TOTALLY?
- int print (const ASYS_TCHAR host_name[],
- u_long verbose_flag,
- FILE *fp = stderr);
+#if !defined (ACE_HAS_WINCE) /* @@ Sould this be ACE_LACKS_IOSTREAM_TOTALLY? */
+ int print (const ASYS_TCHAR host_name[],
+ u_long verbose_flag,
+ FILE *fp = stderr);
// Write the contents of the logging record to the appropriate
// <FILE>.
- int print (const ASYS_TCHAR host_name[],
- u_long verbose_flag,
- ostream &stream);
+ int print (const ASYS_TCHAR host_name[],
+ u_long verbose_flag,
+ ostream &stream);
// Write the contents of the logging record to the appropriate
// <ostream>.
#else
@@ -75,9 +75,9 @@ public:
u_long verbose_flag,
CString *msg);
- int print (const ASYS_TCHAR host_name[],
- u_long verbose_flag,
- FILE *fp);
+ int print (const ASYS_TCHAR host_name[],
+ u_long verbose_flag,
+ FILE *fp);
// Write the contents of the logging record to the appropriate
// <FILE>.
@@ -154,7 +154,7 @@ private:
void round_up (void);
// Round up to the alignment restrictions.
- ACE_INT32 length_;
+ ACE_INT32 length_;
// Total length of the logging record in bytes. This field *must*
// come first in order for various IPC framing mechanisms to work
// correctly. In addition, the field must be an ACE_INT32 in order
@@ -163,14 +163,14 @@ private:
long type_;
// Type of logging record.
- ACE_Time_Value time_stamp_;
+ ACE_Time_Value time_stamp_;
// Time that the logging record was generated.
- long pid_;
+ long pid_;
// Id of process that generated the logging record.
- ASYS_TCHAR msg_data_[MAXLOGMSGLEN];
- // Logging record data
+ ASYS_TCHAR msg_data_[MAXLOGMSGLEN];
+ // Logging record data
static const ASYS_TCHAR *priority_names_[];
// Symbolic names for the <ACE_Log_Priority> enums.
diff --git a/ace/OS.h b/ace/OS.h
index 33782c79af4..4743b7dbe88 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -382,7 +382,7 @@
// hard-coded to Microsoft proprietary extensions to C++.
// First, we define how to properly export/import objects.
-# if defined (ACE_WIN32) // Only Win32 needs special treatment.
+# if defined (ACE_WIN32) /* Only Win32 needs special treatment. */
# if defined(_MSC_VER) || defined(__BORLANDC__)
/* Microsoft, Borland: */
# define ACE_Proper_Export_Flag __declspec (dllexport)