summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp22
1 files changed, 7 insertions, 15 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index 91ef3d63be5..bfbfb34f812 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -13,15 +13,12 @@
//
// ============================================================================
-#include "orbsvcs/Concurrency/CC_LockSet.h"
+#include "CC_LockSet.h"
ACE_RCSID (Concurrency,
CC_LockSet,
"$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
// Default constructor.
CC_LockSet::CC_LockSet (void)
@@ -317,14 +314,9 @@ CC_LockSet::dump (void)
lock_[CC_W]));
}
-CORBA::Boolean const
-CC_LockSet::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES] =
- {
- {1, 1, 1, 1, 0},
- {1, 1, 1, 0, 0},
- {1, 1, 0, 0, 0},
- {1, 0, 0, 1, 0},
- {0, 0, 0, 0, 0}
- };
-
-TAO_END_VERSIONED_NAMESPACE_DECL
+CORBA::Boolean CC_LockSet::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES] ={
+ {1, 1, 1, 1, 0},
+ {1, 1, 1, 0, 0},
+ {1, 1, 0, 0, 0},
+ {1, 0, 0, 1, 0},
+ {0, 0, 0, 0, 0}};