diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-04-22 08:48:30 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-04-22 08:48:30 +0000 |
| commit | ef690dec8575e4926d5617d4685383e1b821bd21 (patch) | |
| tree | 36ea918450a6333b0bddefc2e5f2ef3cceeabdbe | |
| parent | dc0a8fb384fab4a526482e65fb7dd431433537e7 (diff) | |
| download | ATCD-ef690dec8575e4926d5617d4685383e1b821bd21.tar.gz | |
Wed Apr 22 09:48:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Atomic_Op_T.cpp:
* ace/Guard_T.cpp:
Fixed compile problems when ACE_HAS_DUMP is enabled. Thanks to
Skrzyniarz Alexandre <alexandre dot skrzyniarz at fr dot thalesgroup dot com>
for reporting this
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | ACE/ace/Atomic_Op_T.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/Guard_T.cpp | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 67564c431cb..b38b4f211aa 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Wed Apr 22 09:48:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Atomic_Op_T.cpp: + * ace/Guard_T.cpp: + Fixed compile problems when ACE_HAS_DUMP is enabled. Thanks to + Skrzyniarz Alexandre <alexandre dot skrzyniarz at fr dot thalesgroup dot com> + for reporting this + Tue Apr 21 14:50:23 UTC 2009 James H. Hill <hillj@isis.vanderbilt.edu> * docs/ace_guidelines.vsmacros: diff --git a/ACE/THANKS b/ACE/THANKS index 25d95335f3f..796ec5019d5 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2287,6 +2287,7 @@ Igor Rayak <igor dot rayak at gmail dot com> Shai Kedem <shai_kedem at hotmail dot com> Steve Ramsay <steve dot ramsay at caris dot com> <moyyo at freetekno dot cz> +Skrzyniarz Alexandre <alexandre dot skrzyniarz at fr dot thalesgroup dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/ace/Atomic_Op_T.cpp b/ACE/ace/Atomic_Op_T.cpp index ad8f6b01059..87ae8e78027 100644 --- a/ACE/ace/Atomic_Op_T.cpp +++ b/ACE/ace/Atomic_Op_T.cpp @@ -38,7 +38,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump (void) const // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->mutex_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP, this)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Guard_T.cpp b/ACE/ace/Guard_T.cpp index d9c72e30be1..895c0d9ffdc 100644 --- a/ACE/ace/Guard_T.cpp +++ b/ACE/ace/Guard_T.cpp @@ -32,7 +32,7 @@ ACE_Guard<ACE_LOCK>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_ = %x\n"), this->lock_)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP, this)); #endif /* ACE_HAS_DUMP */ } |