From 3ca80a73367bfbf8531ab1f38b8ec1cf2a66703e Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Fri, 19 Jan 2018 23:19:46 +0100
Subject: [PATCH] util/RefCount, db/simple/Mount: remove obsolete libc++
 workarounds

No longer a problem with NDK r16.
---
 src/db/plugins/simple/Mount.cxx | 7 -------
 src/util/RefCount.hxx           | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/src/db/plugins/simple/Mount.cxx b/src/db/plugins/simple/Mount.cxx
index c07b67abc..1945b74c6 100644
--- a/src/db/plugins/simple/Mount.cxx
+++ b/src/db/plugins/simple/Mount.cxx
@@ -25,13 +25,6 @@
 #include "db/Interface.hxx"
 #include "fs/Traits.hxx"
 
-#ifdef _LIBCPP_VERSION
-/* workaround for "error: incomplete type 'PlaylistInfo' used in type
-   trait expression" with libc++ version 3900 (from Android NDK
-   r13b) */
-#include "db/PlaylistInfo.hxx"
-#endif
-
 #include <string>
 
 struct PrefixedLightDirectory : LightDirectory {
diff --git a/src/util/RefCount.hxx b/src/util/RefCount.hxx
index 8faf839f1..a3466eb9a 100644
--- a/src/util/RefCount.hxx
+++ b/src/util/RefCount.hxx
@@ -42,11 +42,6 @@ class RefCount {
 	std::atomic_uint n;
 
 public:
-#ifndef _LIBCPP_VERSION
-	/* the "constexpr" is missing in libc++'s "atomic"
-	   implementation */
-	constexpr
-#endif
 	RefCount():n(1) {}
 
 	void Increment() {