From d96671ae54ca1f9cbc47ac4494421b7af7a5cf65 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 13 Nov 2018 13:28:09 +0100 Subject: btrfs-progs: kerncompat: rename swap to __swap The 'swap' is too generic and clashes with some userspace tools that compile against btrfs, eg. snapper when including boost::smart_ptr::scoped_array after kerncompat.h: /usr/include/boost/smart_ptr/scoped_array.hpp:127:13: error: macro "swap" requires 2 arguments, but only 1 given a.swap(b); Signed-off-by: David Sterba --- delayed-ref.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'delayed-ref.c') diff --git a/delayed-ref.c b/delayed-ref.c index e8123436..9974dbbd 100644 --- a/delayed-ref.c +++ b/delayed-ref.c @@ -201,7 +201,7 @@ static bool merge_ref(struct btrfs_trans_handle *trans, mod = next->ref_mod; } else { if (ref->ref_mod < next->ref_mod) { - swap(ref, next); + __swap(ref, next); done = true; } mod = -next->ref_mod; -- cgit v1.2.3