From a236e04a281da3ce9b96418ed81a1dff85008da5 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 8 Mar 2011 10:57:43 +0200 Subject: Use more consistent naming convention --- common/lazy-ptr/driver.cxx | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/common/lazy-ptr/driver.cxx b/common/lazy-ptr/driver.cxx index c40eb92..5f95c9a 100644 --- a/common/lazy-ptr/driver.cxx +++ b/common/lazy-ptr/driver.cxx @@ -119,11 +119,11 @@ main (int argc, char* argv[]) // Load. // - cont* lc (o->c.load ()); - obj* lo (c->o[0].load ()); + cont* cl (o->c.load ()); + obj* ol (c->o[0].load ()); - assert (lc == c.get ()); - assert (lo == o); + assert (cl == c.get ()); + assert (ol == o); // Test unload/reload. // @@ -191,11 +191,11 @@ main (int argc, char* argv[]) // Load. // - cont* lc (o->c.load ()); - const auto_ptr& lo (c->o.load ()); + cont* cl (o->c.load ()); + const auto_ptr& ol (c->o.load ()); - assert (lc == c.get ()); - assert (lo.get () == o); + assert (cl == c.get ()); + assert (ol.get () == o); t.commit (); } @@ -295,11 +295,11 @@ main (int argc, char* argv[]) // Load. // - shared_ptr lc (o->c.load ()); - shared_ptr lo (c->o[0].load ()); + shared_ptr cl (o->c.load ()); + shared_ptr ol (c->o[0].load ()); - assert (lc == c); - assert (lo == o); + assert (cl == c); + assert (ol == o); t.commit (); } @@ -321,11 +321,11 @@ main (int argc, char* argv[]) // Reload. // assert (!c->o[1].loaded ()); - shared_ptr lo (c->o[1].load ()); + shared_ptr ol (c->o[1].load ()); assert (c->o[1].loaded ()); - lo.reset (); + ol.reset (); assert (!c->o[1].loaded ()); - lo = c->o[1].load (); + ol = c->o[1].load (); assert (c->o[1].loaded ()); t.commit (); -- cgit v1.1