diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
| commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
| tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/third_party/libaddressinput | |
| parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) | |
| download | qtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz | |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/third_party/libaddressinput')
| -rw-r--r-- | chromium/third_party/libaddressinput/src/cpp/src/util/size.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/third_party/libaddressinput/src/cpp/src/util/size.h b/chromium/third_party/libaddressinput/src/cpp/src/util/size.h index 6df98dce653..4128f208fff 100644 --- a/chromium/third_party/libaddressinput/src/cpp/src/util/size.h +++ b/chromium/third_party/libaddressinput/src/cpp/src/util/size.h @@ -35,7 +35,8 @@ namespace addressinput { // 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) || _MSC_VER >= 1900 + (_LIBCPP_VERSION >= 1101 && _LIBCPP_STD_VER > 14) || \ + (!defined(_LIBCPP_STD_VER) && _MSC_VER >= 1900) using std::size; |