X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2FLockable.cpp;h=3f692a9767db1f2f663432655bb22915d62e73f6;hb=b0b445e21567efd899d2d446270b8f62fffb724a;hp=4d9c5a4f83825799b7f22bc55cef66ad6c81989f;hpb=9c603f59922fd9681c4c664550b728d6a8fc2fee;p=shibboleth%2Fxmltooling.git diff --git a/xmltooling/Lockable.cpp b/xmltooling/Lockable.cpp index 4d9c5a4..3f692a9 100644 --- a/xmltooling/Lockable.cpp +++ b/xmltooling/Lockable.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2009 Internet2 + * Copyright 2009-2010 Internet2 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,20 +36,20 @@ Lockable::~Lockable() Locker::Locker(Lockable* lockee, bool lock) { if (lockee && lock) - m_lockee=lockee->lock(); + m_lockee = lockee->lock(); else - m_lockee=lockee; + m_lockee = lockee; } void Locker::assign(Lockable* lockee, bool lock) { if (m_lockee) m_lockee->unlock(); - m_lockee=NULL; + m_lockee = nullptr; if (lockee && lock) - m_lockee=lockee->lock(); + m_lockee = lockee->lock(); else - m_lockee=lockee; + m_lockee = lockee; } Locker::~Locker()