commit 81e7ead903f5b71a326e0584f4325f106c804df1
author Rouslan Solomakhin <rouslan@google.com> Thu Feb 21 21:00:53 2019
committer GitHub <noreply@github.com> Thu Feb 21 21:00:53 2019
tree 71b59de211275108d9a274eeab91c7e411005438
parent d7ed8e2f3f35ce9a3aafdfdc48745ceab66e7229
parent bb799e5a40b6d70c662baecf8179d6e19028220a

Merge pull request #172 from tanderson-google/libcpp-win

Fix build with Windows/libc++

cpp/src/util/size.h

diff --git a/cpp/src/util/size.h b/cpp/src/util/size.h
index 4128f20..539f105 100644
--- a/cpp/src/util/size.h
+++ b/cpp/src/util/size.h
@@ -34,9 +34,9 @@
 //
 // https://docs.microsoft.com/en-us/cpp/visual-cpp-language-conformance
 
-#if __cpp_lib_nonmember_container_access >= 201411 || \
-    (_LIBCPP_VERSION >= 1101 && _LIBCPP_STD_VER > 14) || \
-    (!defined(_LIBCPP_STD_VER) && _MSC_VER >= 1900)
+#if (_LIBCPP_VERSION >= 1101 && _LIBCPP_STD_VER > 14) || \
+    (!defined(_LIBCPP_STD_VER) &&                        \
+     (_MSC_VER >= 1900 || __cpp_lib_nonmember_container_access >= 201411))
 
 using std::size;