diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/win/atl.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/win/atl.h')
| -rw-r--r-- | chromium/base/win/atl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/base/win/atl.h b/chromium/base/win/atl.h index f87b7f1aeec..464438ed11c 100644 --- a/chromium/base/win/atl.h +++ b/chromium/base/win/atl.h @@ -1,6 +1,7 @@ // Copyright 2018 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. + #ifndef BASE_WIN_ATL_H_ #define BASE_WIN_ATL_H_ @@ -9,10 +10,6 @@ // Undefine before windows header will make the poisonous defines #include "base/win/windows_undefines.inc" -#ifndef _ATL_NO_EXCEPTIONS -#define _ATL_NO_EXCEPTIONS -#endif - // atlwin.h relies on std::void_t, but libc++ doesn't define it unless // _LIBCPP_STD_VER > 14. Workaround this by manually defining it. #include <type_traits> @@ -23,6 +20,9 @@ using void_t = void; } #endif +// Declare our own exception thrower (atl_throw.h includes atldef.h). +#include "base/win/atl_throw.h" + #include <atlbase.h> #include <atlcom.h> #include <atlctl.h> |