Merge branch 'master' of https://github.com/wjakob/pybind11

CMakeLists.txt

@@ -23,9 +23,6 @@ find_package(PythonInterp 3 REQUIRED)
 string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
 string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
 if (UNIX)
 if (UNIX)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unsequenced")
-  endif()
   if (NOT ${U_CMAKE_BUILD_TYPE} MATCHES DEBUG)
   if (NOT ${U_CMAKE_BUILD_TYPE} MATCHES DEBUG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -flto")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -flto")
   endif()
   endif()

README.md

-# pybind11 -- Seamless operability between C++11 and Python
+![pybind11 logo](https://github.com/wjakob/pybind11/raw/master/logo.png)
+
+# pybind11 — Seamless operability between C++11 and Python
 
 
 **pybind11** is a lightweight header library that exposes C++ types in Python
 **pybind11** is a lightweight header library that exposes C++ types in Python
 and vice versa, mainly to create Python bindings of existing C++ code. Its
 and vice versa, mainly to create Python bindings of existing C++ code. Its

include/pybind/pybind.h

@@ -16,7 +16,7 @@
 #pragma warning(disable: 4996) // warning C4996: The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name
 #pragma warning(disable: 4996) // warning C4996: The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name
 #pragma warning(disable: 4100) // warning C4100: Unreferenced formal parameter
 #pragma warning(disable: 4100) // warning C4100: Unreferenced formal parameter
 #pragma warning(disable: 4512) // warning C4512: Assignment operator was implicitly defined as deleted
 #pragma warning(disable: 4512) // warning C4512: Assignment operator was implicitly defined as deleted
-#elif defined(__GNUG__)
+#elif defined(__GNUG__) and !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
@@ -818,7 +818,7 @@ NAMESPACE_END(pybind)
 
 
 #if defined(_MSC_VER)
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #pragma warning(pop)
-#elif defined(__GNUG__)
+#elif defined(__GNUG__) and !defined(__clang__)
 #pragma GCC diagnostic pop
 #pragma GCC diagnostic pop
 #endif
 #endif