ChangeLogTag:Tue

3 files changed, 20 insertions, 10 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 638710435d0..d63b4d8f95b 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 14 17:49:04 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Log_Record.h: Disallow copying and assignment of
+          ACE_Log_Record.  Thanks to Jan Kalin <jan dot kalin at zag dot
+          si> for suggesting this.
+
 Tue Aug 14 14:32:57 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * ace/Assert.h:
diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h
index 7671263c7c7..f54d6fe7f5f 100644
--- a/ACE/ace/Log_Msg.h
+++ b/ACE/ace/Log_Msg.h
@@ -134,16 +134,16 @@ class ACE_Log_Record;
  * subsequent call to log().
  *
  * The ACE_Log_Msg class uses two priority masks to control its
- * logging behavior.  The @c priority_mask_ object attribute is thread-
- * specific and specifies the priority levels logged by the thread.
- * The @c process_priority_mask_ class attribute is not thread-specific
- * and specifies the priority levels that will be logged by all
- * threads in the process.  By default, all levels are disabled for
- * @c priority_mask_ and all levels are enabled for
- * @c process_priority_mask_ (i.e. the process-wide mask controls
- * the settings, and each instance can expand on it if desired).
- * Both priority masks can be modified using the priority_mask()
- * method of this class.
+ * logging behavior.  The @c priority_mask_ object attribute is
+ * thread- specific and specifies the priority levels logged by the
+ * thread.  The @c process_priority_mask_ class attribute is not
+ * thread-specific and specifies the priority levels that will be
+ * logged by all threads in the process.  By default, all levels are
+ * disabled for @c priority_mask_ and all levels are enabled for @c
+ * process_priority_mask_ (i.e. the process-wide mask controls the
+ * settings, and each instance can expand on it if desired).  Both
+ * priority masks can be modified using the priority_mask() method of
+ * this class.
  */
 class ACE_Export ACE_Log_Msg
 {
diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h
index ec36a5d7057..d03faeb8680 100644
--- a/ACE/ace/Log_Record.h
+++ b/ACE/ace/Log_Record.h
@@ -199,6 +199,10 @@ private:
   /// Logging record data
   ACE_TCHAR *msg_data_;   // Heap-allocated text message area
   size_t msg_data_size_;  // Allocated size of msg_data_ in ACE_TCHARs
+
+  /// disallow copying...
+  ACE_Log_Record (const ACE_Log_Record& rhs);
+  ACE_Log_Record& operator= (const ACE_Log_Record& rhs);
 };
 
 // Forward decls.