diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-07-12 20:40:32 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-07-12 20:40:32 +0000 |
| commit | 5c6b65adcd96f6d0fc96fa998443823a2933bdae (patch) | |
| tree | 068fe683b41b245450a6554e1f6eed6e3c16f093 | |
| parent | 68da015ce58029a5a5281e7bd50e552e317c7287 (diff) | |
| download | ATCD-5c6b65adcd96f6d0fc96fa998443823a2933bdae.tar.gz | |
Removed conflict tags.
| -rw-r--r-- | ChangeLog | 40 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 40 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 40 |
3 files changed, 0 insertions, 120 deletions
diff --git a/ChangeLog b/ChangeLog index 61a8f91784d..b4584e94a95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -421,28 +421,10 @@ Fri Jul 6 08:36:20 2001 Chad Elliott <elliott_c@ociweb.com> contain Other. The netsvcs library requires Naming_Context. Fri Jul 6 05:44:13 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> -<<<<<<< ChangeLog -======= * ace/Makefile (LOGGING_FILES): Added support for Log_Msg_UNIX_Syslog. ->>>>>>> 4.2247 -<<<<<<< ChangeLog - * ace/Makefile (LOGGING_FILES): Added support for - Log_Msg_UNIX_Syslog. - - * ace/Log_Msg_UNIX_Syslog.{h,cpp}: - * ace/Log_Msg.cpp, - * ace/OS.h: Added support for a new UNIX syslog backend for the - ACE_Log_Msg class. Thanks to Jerry D. De Master - <jdemaster@rite-solutions.com> and Robert Davidson - <robert@rdavidson.freeserve.co.uk>. - - * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method - comments. Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for - reporting this. -======= * ace/Log_Msg_UNIX_Syslog.{h,cpp}: * ace/Log_Msg.cpp, * ace/OS.h: Added support for a new UNIX syslog backend for the @@ -453,7 +435,6 @@ Fri Jul 6 05:44:13 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method comments. Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for reporting this. ->>>>>>> 4.2247 * ace/config-macosx.h: Added a new file courtesy of John Zorko so that things will work on MacOSX. @@ -502,41 +483,20 @@ Sun Jun 24 11:25:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> bug_575. Fri Jun 22 16:52:13 2001 Balachandran Natarajan <bala@cs.wustl.edu> -<<<<<<< ChangeLog -======= * ace/CDR_Stream.cpp: Changed the copy constructor for the ACE_InputCDR's. Instead of duplicating the ACE_Data_Block we now use the new copy constructor in the ACE_Message_Block. ->>>>>>> 4.2247 -<<<<<<< ChangeLog - * ace/CDR_Stream.cpp: Changed the copy constructor for the - ACE_InputCDR's. Instead of duplicating the ACE_Data_Block we - now use the new copy constructor in the ACE_Message_Block. - - * ace/Message_Block.h: - * ace/Message_Block.cpp: Added a new copy constructor to the - ACE_Message_Block. This copy constructor does a deep copy from - the data block if the data block of the incoming message block - is on the stack or does a shallow copy of the data block (by - incrementing the ref count) if it is on the heap. -======= * ace/Message_Block.h: * ace/Message_Block.cpp: Added a new copy constructor to the ACE_Message_Block. This copy constructor does a deep copy from the data block if the data block of the incoming message block is on the stack or does a shallow copy of the data block (by incrementing the ref count) if it is on the heap. ->>>>>>> 4.2247 - -<<<<<<< ChangeLog - END of entries from bug_575_stage_2. -======= END of entries from bug_575_stage_2. ->>>>>>> 4.2247 Thu Jul 5 22:07:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> * bin/auto_run_tests.lst: Added the new perl script in LongUpcalls diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 61a8f91784d..b4584e94a95 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -421,28 +421,10 @@ Fri Jul 6 08:36:20 2001 Chad Elliott <elliott_c@ociweb.com> contain Other. The netsvcs library requires Naming_Context. Fri Jul 6 05:44:13 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> -<<<<<<< ChangeLog -======= * ace/Makefile (LOGGING_FILES): Added support for Log_Msg_UNIX_Syslog. ->>>>>>> 4.2247 -<<<<<<< ChangeLog - * ace/Makefile (LOGGING_FILES): Added support for - Log_Msg_UNIX_Syslog. - - * ace/Log_Msg_UNIX_Syslog.{h,cpp}: - * ace/Log_Msg.cpp, - * ace/OS.h: Added support for a new UNIX syslog backend for the - ACE_Log_Msg class. Thanks to Jerry D. De Master - <jdemaster@rite-solutions.com> and Robert Davidson - <robert@rdavidson.freeserve.co.uk>. - - * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method - comments. Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for - reporting this. -======= * ace/Log_Msg_UNIX_Syslog.{h,cpp}: * ace/Log_Msg.cpp, * ace/OS.h: Added support for a new UNIX syslog backend for the @@ -453,7 +435,6 @@ Fri Jul 6 05:44:13 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method comments. Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for reporting this. ->>>>>>> 4.2247 * ace/config-macosx.h: Added a new file courtesy of John Zorko so that things will work on MacOSX. @@ -502,41 +483,20 @@ Sun Jun 24 11:25:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> bug_575. Fri Jun 22 16:52:13 2001 Balachandran Natarajan <bala@cs.wustl.edu> -<<<<<<< ChangeLog -======= * ace/CDR_Stream.cpp: Changed the copy constructor for the ACE_InputCDR's. Instead of duplicating the ACE_Data_Block we now use the new copy constructor in the ACE_Message_Block. ->>>>>>> 4.2247 -<<<<<<< ChangeLog - * ace/CDR_Stream.cpp: Changed the copy constructor for the - ACE_InputCDR's. Instead of duplicating the ACE_Data_Block we - now use the new copy constructor in the ACE_Message_Block. - - * ace/Message_Block.h: - * ace/Message_Block.cpp: Added a new copy constructor to the - ACE_Message_Block. This copy constructor does a deep copy from - the data block if the data block of the incoming message block - is on the stack or does a shallow copy of the data block (by - incrementing the ref count) if it is on the heap. -======= * ace/Message_Block.h: * ace/Message_Block.cpp: Added a new copy constructor to the ACE_Message_Block. This copy constructor does a deep copy from the data block if the data block of the incoming message block is on the stack or does a shallow copy of the data block (by incrementing the ref count) if it is on the heap. ->>>>>>> 4.2247 - -<<<<<<< ChangeLog - END of entries from bug_575_stage_2. -======= END of entries from bug_575_stage_2. ->>>>>>> 4.2247 Thu Jul 5 22:07:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> * bin/auto_run_tests.lst: Added the new perl script in LongUpcalls diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 61a8f91784d..b4584e94a95 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -421,28 +421,10 @@ Fri Jul 6 08:36:20 2001 Chad Elliott <elliott_c@ociweb.com> contain Other. The netsvcs library requires Naming_Context. Fri Jul 6 05:44:13 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> -<<<<<<< ChangeLog -======= * ace/Makefile (LOGGING_FILES): Added support for Log_Msg_UNIX_Syslog. ->>>>>>> 4.2247 -<<<<<<< ChangeLog - * ace/Makefile (LOGGING_FILES): Added support for - Log_Msg_UNIX_Syslog. - - * ace/Log_Msg_UNIX_Syslog.{h,cpp}: - * ace/Log_Msg.cpp, - * ace/OS.h: Added support for a new UNIX syslog backend for the - ACE_Log_Msg class. Thanks to Jerry D. De Master - <jdemaster@rite-solutions.com> and Robert Davidson - <robert@rdavidson.freeserve.co.uk>. - - * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method - comments. Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for - reporting this. -======= * ace/Log_Msg_UNIX_Syslog.{h,cpp}: * ace/Log_Msg.cpp, * ace/OS.h: Added support for a new UNIX syslog backend for the @@ -453,7 +435,6 @@ Fri Jul 6 05:44:13 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method comments. Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for reporting this. ->>>>>>> 4.2247 * ace/config-macosx.h: Added a new file courtesy of John Zorko so that things will work on MacOSX. @@ -502,41 +483,20 @@ Sun Jun 24 11:25:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> bug_575. Fri Jun 22 16:52:13 2001 Balachandran Natarajan <bala@cs.wustl.edu> -<<<<<<< ChangeLog -======= * ace/CDR_Stream.cpp: Changed the copy constructor for the ACE_InputCDR's. Instead of duplicating the ACE_Data_Block we now use the new copy constructor in the ACE_Message_Block. ->>>>>>> 4.2247 -<<<<<<< ChangeLog - * ace/CDR_Stream.cpp: Changed the copy constructor for the - ACE_InputCDR's. Instead of duplicating the ACE_Data_Block we - now use the new copy constructor in the ACE_Message_Block. - - * ace/Message_Block.h: - * ace/Message_Block.cpp: Added a new copy constructor to the - ACE_Message_Block. This copy constructor does a deep copy from - the data block if the data block of the incoming message block - is on the stack or does a shallow copy of the data block (by - incrementing the ref count) if it is on the heap. -======= * ace/Message_Block.h: * ace/Message_Block.cpp: Added a new copy constructor to the ACE_Message_Block. This copy constructor does a deep copy from the data block if the data block of the incoming message block is on the stack or does a shallow copy of the data block (by incrementing the ref count) if it is on the heap. ->>>>>>> 4.2247 - -<<<<<<< ChangeLog - END of entries from bug_575_stage_2. -======= END of entries from bug_575_stage_2. ->>>>>>> 4.2247 Thu Jul 5 22:07:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> * bin/auto_run_tests.lst: Added the new perl script in LongUpcalls |