diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-11-27 21:22:15 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-11-27 21:22:15 +0000 |
| commit | 663660f676a88215851e9803da82395d86db2a35 (patch) | |
| tree | 9bc183f1387013f95d099dbe626b0f6b490dbb54 /ACE/ace/Log_Msg.h | |
| parent | 1d924c99a0ee0260e897596642336ff6d68883b2 (diff) | |
| download | ATCD-663660f676a88215851e9803da82395d86db2a35.tar.gz | |
Sun Nov 27 18:19:18 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
Merging in another set of changes. The skeletons got refactored even
more and now the S.inl files are not generated anymore. For CIAO
we now generate the facet servants in new _svnt_T.{h,cpp} files, which
is the first step in a major refactoring and simplification of the
CCM servants which is also a first step in the direction of a Common
Component Model
Diffstat (limited to 'ACE/ace/Log_Msg.h')
| -rw-r--r-- | ACE/ace/Log_Msg.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index 14a6e7cb33d..f847c4ede0e 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -556,16 +556,16 @@ public: size_t size, const ACE_TCHAR *text = 0); - static void init_hook (ACE_OS_Log_Msg_Attributes &attributes -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - , ACE_SEH_EXCEPT_HANDLER selector = 0 - , ACE_SEH_EXCEPT_HANDLER handler = 0 -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ /** * Init hook, create a Log_Msg_Attribute object, initialize its * attributes from the TSS Log_Msg and save the object in the * @a attributes argument */ + static void init_hook (ACE_OS_Log_Msg_Attributes &attributes +# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) + , ACE_SEH_EXCEPT_HANDLER selector = 0 + , ACE_SEH_EXCEPT_HANDLER handler = 0 +# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ ); /** |