diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-14 05:43:20 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-14 05:43:20 +0000 |
| commit | 7f9794dd90b11b5ce7c628dc09ce2f7a2cc2ff43 (patch) | |
| tree | 99833abc31269b4f60268bd7f9d1fae7a2e79c21 | |
| parent | c3313080855e1fafaa5deb1982cc8e7090505a27 (diff) | |
| download | ATCD-7f9794dd90b11b5ce7c628dc09ce2f7a2cc2ff43.tar.gz | |
ChangeLogTag:Fri Oct 13 22:40:27 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 10 | ||||
| -rw-r--r-- | ace/Log_Msg.cpp | 2 | ||||
| -rw-r--r-- | ace/ace_dll.dsp | 96 | ||||
| -rw-r--r-- | ace/ace_lib.dsp | 96 |
6 files changed, 223 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4c0a45f5606..f015a9bb7b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Fri Oct 13 22:40:27 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + Add new files to the project. + + * ace/Log_Msg.cpp: + Fixed typo in management of structured exception handling + callbacks. + Fri Oct 13 21:49:54 2000 Carlos O'Ryan <coryan@uci.edu> * ace/Makefile: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 4c0a45f5606..f015a9bb7b7 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Fri Oct 13 22:40:27 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + Add new files to the project. + + * ace/Log_Msg.cpp: + Fixed typo in management of structured exception handling + callbacks. + Fri Oct 13 21:49:54 2000 Carlos O'Ryan <coryan@uci.edu> * ace/Makefile: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 4c0a45f5606..f015a9bb7b7 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,13 @@ +Fri Oct 13 22:40:27 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + Add new files to the project. + + * ace/Log_Msg.cpp: + Fixed typo in management of structured exception handling + callbacks. + Fri Oct 13 21:49:54 2000 Carlos O'Ryan <coryan@uci.edu> * ace/Makefile: diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index 501c05ea937..59e998c4b59 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -1791,7 +1791,7 @@ ACE_Log_Msg::init_hook (ACE_OS_Log_Msg_Attributes &attributes { # if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) attributes.seh_except_selector_ = selector; - attributes.handler_ = handler; + attributes.seh_except_handler_ = handler; # endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ if (ACE_Log_Msg::exists ()) { diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp index a7b3520a23d..42f6e8939d5 100644 --- a/ace/ace_dll.dsp +++ b/ace/ace_dll.dsp @@ -1475,6 +1475,63 @@ SOURCE=.\Log_Msg.cpp # End Source File
# Begin Source File
+SOURCE=.\Log_Msg_Backend.cpp
+
+!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Log_Msg_Callback.cpp
+
+!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Log_Msg_IPC.cpp
+
+!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Log_Record.cpp
!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
@@ -2121,6 +2178,25 @@ SOURCE=.\OS_Dirent.cpp # End Source File
# Begin Source File
+SOURCE=.\OS_Log_Msg_Attributes.cpp
+
+!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\OS_Memory.cpp
!IF "$(CFG)" == "ACE DLL - Win32 Alpha Release"
@@ -4538,6 +4614,18 @@ SOURCE=.\Log_Msg.h # End Source File
# Begin Source File
+SOURCE=.\Log_Msg_Backend.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Log_Msg_Callback.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Log_Msg_IPC.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Log_Priority.h
# End Source File
# Begin Source File
@@ -4710,6 +4798,10 @@ SOURCE=.\OS_Dirent.h # End Source File
# Begin Source File
+SOURCE=.\OS_Log_Msg_Attributes.h
+# End Source File
+# Begin Source File
+
SOURCE=.\OS_Memory.h
# End Source File
# Begin Source File
@@ -5670,6 +5762,10 @@ SOURCE=.\OS_Dirent.inl # End Source File
# Begin Source File
+SOURCE=.\OS_Log_Msg_Attributes.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\OS_Memory.inl
# End Source File
# Begin Source File
diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp index a08ddf64371..3938df44e05 100644 --- a/ace/ace_lib.dsp +++ b/ace/ace_lib.dsp @@ -1431,6 +1431,63 @@ SOURCE=.\Log_Msg.cpp # End Source File
# Begin Source File
+SOURCE=.\Log_Msg_Backend.cpp
+
+!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Log_Msg_Callback.cpp
+
+!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Log_Msg_IPC.cpp
+
+!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Log_Record.cpp
!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
@@ -2077,6 +2134,25 @@ SOURCE=.\OS_Dirent.cpp # End Source File
# Begin Source File
+SOURCE=.\OS_Log_Msg_Attributes.cpp
+
+!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\OS_Memory.cpp
!IF "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"
@@ -4475,6 +4551,18 @@ SOURCE=.\Log_Msg.h # End Source File
# Begin Source File
+SOURCE=.\Log_Msg_Backend.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Log_Msg_Callback.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Log_Msg_IPC.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Log_Priority.h
# End Source File
# Begin Source File
@@ -4647,6 +4735,10 @@ SOURCE=.\OS_Dirent.h # End Source File
# Begin Source File
+SOURCE=.\OS_Log_Msg_Attributes.h
+# End Source File
+# Begin Source File
+
SOURCE=.\OS_Memory.h
# End Source File
# Begin Source File
@@ -5607,6 +5699,10 @@ SOURCE=.\OS_Dirent.inl # End Source File
# Begin Source File
+SOURCE=.\OS_Log_Msg_Attributes.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\OS_Memory.inl
# End Source File
# Begin Source File
|