diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-25 19:30:51 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-25 19:30:51 +0000 |
| commit | 8010698c016f7725756cd4efd02b54966e602505 (patch) | |
| tree | f30cf872c3fe92579c19f389e0f64a52fe4e83e1 /ace/Log_Msg.h | |
| parent | 1cf1eff3e78cc060c8cce1c9a5f3097113e2a604 (diff) | |
| download | ATCD-8010698c016f7725756cd4efd02b54966e602505.tar.gz | |
ChangeLogTag:Fri Aug 25 12:12:40 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'ace/Log_Msg.h')
| -rw-r--r-- | ace/Log_Msg.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h index 249c49724e7..0274eb69a9e 100644 --- a/ace/Log_Msg.h +++ b/ace/Log_Msg.h @@ -418,15 +418,20 @@ public: // td->acquire_release to block execution until this call // return. -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) && !defined(ACE_HAS_LASTEST_AND_GREATEST) + // These functions are disabled with ACE_HAS_LATEST_AND_GREATEST + // because the *semantics* have changed (they objects are no longer + // TSS). ACE_SEH_EXCEPT_HANDLER seh_except_selector (void); ACE_SEH_EXCEPT_HANDLER seh_except_selector (ACE_SEH_EXCEPT_HANDLER); // Get/Set TSS exception action. + // NOTE: The action is no longer TSS, they are global! ACE_SEH_EXCEPT_HANDLER seh_except_handler (void); ACE_SEH_EXCEPT_HANDLER seh_except_handler (ACE_SEH_EXCEPT_HANDLER); // Get/Set TSS exception handler. -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ + // NOTE: The handler is no longer TSS, they are global! +#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS && ! ACE_HAS_GREATES_AND_LATEST*/ // = Stop/start/query tracing status on a per-thread basis... void stop_tracing (void); @@ -582,13 +587,6 @@ private: // thread descriptor of the thread. This can be used to repidly // access all thread data kept in <ACE_Thread_Descriptor>. -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - ACE_SEH_EXCEPT_HANDLER seh_except_selector_; - ACE_SEH_EXCEPT_HANDLER seh_except_handler_; - // These handlers determine how a thread handles win32 structured - // exception. -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - u_long priority_mask_; // Keeps track of all the per-thread <ACE_Log_Priority> values that // are currently enabled. Default is for all logging priorities to @@ -635,6 +633,9 @@ private: static void close (void); // For cleanup, at program termination. + static void sync_hook (const ACE_TCHAR *prg_name); + // Decouple the OS layer from the Log_Msg layer. + friend void ACE_OS::cleanup_tss (const u_int); // = Disallow these operations. |