From 141f6bdcc7fc1a06a10281f279042d1157e67c70 Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Fri, 8 Sep 2017 16:44:17 +0200
Subject: [PATCH] ControlTest: Removing references to transientAddress().
In order to make DataProxy properly thread-safe, it is helpful to remove
calls to DataProxy::transientAddress. That way, it suffices to have
a lock in the DataProxy object. Trying to add the needed accessor
methods to DataProxy and get rid of calls to transientAddress().
---
AtlasTest/ControlTest/test/DataProxy_test.cxx | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/AtlasTest/ControlTest/test/DataProxy_test.cxx b/AtlasTest/ControlTest/test/DataProxy_test.cxx
index 6bdb2e42262..03cc4af1a48 100644
--- a/AtlasTest/ControlTest/test/DataProxy_test.cxx
+++ b/AtlasTest/ControlTest/test/DataProxy_test.cxx
@@ -53,7 +53,6 @@ int main() {
DataProxy emptyProxy;
assert( !emptyProxy.isValid() );
- assert( emptyProxy.transientAddress() );
//cerr << "Now we expect to see a warning message:" << endl
// << "----Warning Message Starts--->>" << endl;
@@ -65,7 +64,7 @@ int main() {
assert( emptyProxy.name().empty() );
assert( emptyProxy.identifier().empty() );
assert( 0 == emptyProxy.clID() );
- assert( 0 == emptyProxy.transientAddress()->transientID().size() );
+ assert( 0 == emptyProxy.transientID().size() );
assert( emptyProxy.isResetOnly() );
assert( !emptyProxy.isConst() );
try {
@@ -88,7 +87,7 @@ int main() {
assert( transientProxy.name() == "bla" );
assert( transientProxy.identifier() == "bla" );
assert( ClassID_traits<Bla>::ID() == transientProxy.clID() );
- assert( transientProxy.transientAddress()->transientID().size() == 1);
+ assert( transientProxy.transientID().size() == 1);
assert( transientProxy.isResetOnly() );
assert( !transientProxy.isConst() );
assert( (DataProxy_cast<Bla>(transientProxy)).i == 77 );
@@ -117,7 +116,7 @@ int main() {
assert( addressProxy.name() == "foo" );
assert( addressProxy.identifier() == "foo" );
assert( ClassID_traits<Foo>::ID() == addressProxy.clID() );
- assert( addressProxy.transientAddress()->transientID().size() == 1);
+ assert( addressProxy.transientID().size() == 1);
assert( addressProxy.isResetOnly() );
assert( !addressProxy.isConst() );
const Foo& fRef(DataProxy_cast<Foo>(addressProxy));
@@ -145,7 +144,7 @@ int main() {
assert( identifiedProxy.name() == "bla" );
assert( identifiedProxy.identifier() == "bla" );
assert( ClassID_traits<Bla>::ID() == identifiedProxy.clID() );
- assert( identifiedProxy.transientAddress()->transientID().size() == 1);
+ assert( identifiedProxy.transientID().size() == 1);
assert( identifiedProxy.isResetOnly() );
assert( !identifiedProxy.isConst() );
try {
--
GitLab