diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-09-08 13:29:28 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-09-08 13:29:28 +0000 |
| commit | 2ce1da3c649a5dfe8add2d41a64d131a1e587336 (patch) | |
| tree | 93d1e156365ead1f1f80c6ad0aec5ac49d4233aa | |
| parent | 84289b3f13abb44315fa44edf59f9852cb149f34 (diff) | |
| download | ATCD-2ce1da3c649a5dfe8add2d41a64d131a1e587336.tar.gz | |
Mon Sep 8 13:30:45 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Auto_IncDec_T.h:
Fixed compile error because ACE_Copy_Disabled was implicitly
pulled in before
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/Auto_IncDec_T.h | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 03ddb8b53af..3b6338076a0 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Sep 8 13:30:45 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Auto_IncDec_T.h: + Fixed compile error because ACE_Copy_Disabled was implicitly + pulled in before + Mon Sep 8 13:24:53 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> * netsvcs/lib/Log_Message_Receiver.h: diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h index 437b5fe4780..3e85b178a4f 100644 --- a/ACE/ace/Auto_IncDec_T.h +++ b/ACE/ace/Auto_IncDec_T.h @@ -38,7 +38,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * must provide at least operators ++ and --. */ template <class ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> -class ACE_Auto_IncDec : private ACE_Copy_Disabled +class ACE_Auto_IncDec { public: /// Implicitly increment the counter. @@ -54,6 +54,9 @@ protected: /// Reference to the @c ACE_SAFELY_INCREMENTABLE_DECREMENTABLE counter /// we're incrementing/decrementing. ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter_; +private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Auto_IncDec (const ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> &)) }; ACE_END_VERSIONED_NAMESPACE_DECL |