diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-02-25 13:27:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 13:27:03 +0100 |
| commit | fdf9fe05d6a4499ced8b55b52f179275ce0c90b0 (patch) | |
| tree | b63469e57597713738afea9d42ef0e78fcb9d7d4 /TAO/tao/Condition.cpp | |
| parent | e4bcaf22324492a0d784890cd9ca86b4a707e68f (diff) | |
| parent | ab938af466a77a9992d95da9fc832ff50444255f (diff) | |
| download | ATCD-fdf9fe05d6a4499ced8b55b52f179275ce0c90b0.tar.gz | |
Merge pull request #1440 from jwillemsen/jw-cleanupvc6
Cleanup for vc6, use nullptr, remove redundant void, layout changes
Diffstat (limited to 'TAO/tao/Condition.cpp')
| -rw-r--r-- | TAO/tao/Condition.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp index 0197963070c..04fe4aa0fa4 100644 --- a/TAO/tao/Condition.cpp +++ b/TAO/tao/Condition.cpp @@ -7,15 +7,13 @@ # include "tao/Condition.inl" #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class MUTEX> TAO_Condition<MUTEX>::TAO_Condition (MUTEX &m) - : mutex_ (&m), delete_lock_ (false), - cond_ (0) + cond_ (nullptr) { // @todo: Need to add the allocatore here.. ACE_NEW (this->cond_, @@ -24,13 +22,12 @@ TAO_Condition<MUTEX>::TAO_Condition (MUTEX &m) template <class MUTEX> TAO_Condition<MUTEX>::TAO_Condition (void) - : mutex_ (0), + : mutex_ (nullptr), delete_lock_ (false), - cond_ (0) + cond_ (nullptr) { // @todo: Need to add the allocatore here.. - ACE_NEW (this->mutex_, MUTEX); |