2 commits

Author	SHA1	Message	Date
Antoine Musso	0fd05285d7	pass codesniffer on tests/ ... Fix almost all occurences of the following sniffs: Generic.CodeAnalysis.UselessOverridingMethod.Found Generic.Formatting.NoSpaceAfterCast.SpaceFound Generic.Functions.FunctionCallArgumentSpacing.SpaceBeforeComma Generic.Functions.OpeningFunctionBraceKernighanRitchie.BraceOnNewLine Generic.PHP.LowerCaseConstant.Found PSR2.Classes.PropertyDeclaration.ScopeMissing PSR2.Files.EndFileNewline.TooMany PSR2.Methods.MethodDeclaration.StaticBeforeVisibility Change-Id: I96aacef5bafe5a2bca659744fba1380999cfc37d	2013-01-28 12:14:26 +01:00
Matthias Mullie	74f581e348	Added merge() function to BagOStuff for CAS-like functionality. ... * merge() will use CAS if supported or use locking otherwise * The lock()/unlock() methods now have a default implementation * added unit tests for merge Change-Id: Ic27088488f8532f149cb4b36e156516f22880134	2013-01-10 09:03:09 +01:00