diff options
| author | Adam Mitz <mitza@ociweb.com> | 2015-11-06 17:07:11 -0600 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2015-11-06 17:07:11 -0600 |
| commit | ac5e1702c9f9bee9f1f7bfce8c1a6f3847ea6b4b (patch) | |
| tree | 0e70d1f51c39e688a05a6cdc2af58408222e4a0d /ACE/ace/Assert.cpp | |
| parent | 5272b5b81f92c298cb998b5bb0b0dbca3e7f29fe (diff) | |
| download | ATCD-ac5e1702c9f9bee9f1f7bfce8c1a6f3847ea6b4b.tar.gz | |
Merged branch ace-face-safety (FACE Safety Profile import from OCITAO).
Diffstat (limited to 'ACE/ace/Assert.cpp')
| -rw-r--r-- | ACE/ace/Assert.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ACE/ace/Assert.cpp b/ACE/ace/Assert.cpp index 85788449045..45524c64357 100644 --- a/ACE/ace/Assert.cpp +++ b/ACE/ace/Assert.cpp @@ -14,7 +14,12 @@ __ace_assert(const char *file, int line, const ACE_TCHAR *expression) log->set (file, line, -1, error, log->restart (), log->msg_ostream (), log->msg_callback ()); - log->log (LM_ERROR, ACE_TEXT ("ACE_ASSERT: file %N, line %l assertion failed for '%s'.%a\n"), expression, -1); +#ifdef ACE_LACKS_VA_FUNCTIONS +#define LOG_ARGS +#else +#define LOG_ARGS(X) X +#endif + log->log LOG_ARGS ((LM_ERROR, ACE_TEXT ("ACE_ASSERT: file %N, line %l assertion failed for '%s'.%a\n"), expression, -1)); } ACE_END_VERSIONED_NAMESPACE_DECL |