From d21afe49101d6c702b7516edf869f5a1240014a6 Mon Sep 17 00:00:00 2001
From: stefanocasazza <stefanocasazza@gmail.com>
Date: Thu, 23 Mar 2017 19:15:55 +0100
Subject: [PATCH] sync

---
 include/ulib/base/base.h        | 2 ++
 include/ulib/container/vector.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/ulib/base/base.h b/include/ulib/base/base.h
index 6176c7fc..14abee45 100644
--- a/include/ulib/base/base.h
+++ b/include/ulib/base/base.h
@@ -97,6 +97,8 @@
 #  endif
 #  define U_DO_PRAGMA(x)
 #  define U_DUMP_KERNEL_VERSION(x)
+#  define CLANG_VERSION_NUM (__clang_major__  * 10000 + \
+                             __clang_minor__  *   100)
 #elif defined(U_CSP_INTERFACE)
 #  define U_DO_PRAGMA(x)
 #  define U_DUMP_KERNEL_VERSION(x)
diff --git a/include/ulib/container/vector.h b/include/ulib/container/vector.h
index 021c60c2..de64cc8c 100644
--- a/include/ulib/container/vector.h
+++ b/include/ulib/container/vector.h
@@ -16,7 +16,7 @@
 
 #include <ulib/container/construct.h>
 
-#ifdef U_STDCPP_ENABLE
+#if defined(U_STDCPP_ENABLE) && (!defined(__clang__) || CLANG_VERSION_NUM != 30700)
 #  include <algorithm>
 #endif