Merge branch 'master' of https://github.com/wjakob/pybind11
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8b468c..9130708 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,9 +23,6 @@
string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
if (UNIX)
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)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -flto")
endif()
diff --git a/README.md b/README.md
index e3b8627..36e8158 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-# pybind11 -- Seamless operability between C++11 and Python
+
+
+# pybind11 — Seamless operability between C++11 and 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
diff --git a/include/pybind/pybind.h b/include/pybind/pybind.h
index 55a5d6d..d8838af 100644
--- a/include/pybind/pybind.h
+++ b/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: 4100) // warning C4100: Unreferenced formal parameter
#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 ignored "-Wunused-but-set-parameter"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
@@ -818,7 +818,7 @@
#if defined(_MSC_VER)
#pragma warning(pop)
-#elif defined(__GNUG__)
+#elif defined(__GNUG__) and !defined(__clang__)
#pragma GCC diagnostic pop
#endif
diff --git a/logo.png b/logo.png
new file mode 100644
index 0000000..36d4c6c
--- /dev/null
+++ b/logo.png
Binary files differ
