From db3c6cefceddf25c25f1205d7b633f09e873bf98 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 17 May 2018 02:01:42 +0000 Subject: Update third_party/base/compiler_specific.h. Import Chromium's base/compiler_specific.h from r537069. Now that FALLTHROUGH is available via compiler_specific.h, remove FX_FALLTHROUGH. Change-Id: I8b9631a4f007673e10e0c26951dfd61e9dcada30 Reviewed-on: https://pdfium-review.googlesource.com/32639 Reviewed-by: Nico Weber Commit-Queue: Lei Zhang --- core/fpdfapi/parser/cpdf_data_avail.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/fpdfapi/parser/cpdf_data_avail.cpp') diff --git a/core/fpdfapi/parser/cpdf_data_avail.cpp b/core/fpdfapi/parser/cpdf_data_avail.cpp index 3ffe6f6f0b..1296b2320b 100644 --- a/core/fpdfapi/parser/cpdf_data_avail.cpp +++ b/core/fpdfapi/parser/cpdf_data_avail.cpp @@ -26,8 +26,8 @@ #include "core/fpdfapi/parser/fpdf_parser_utility.h" #include "core/fxcrt/cfx_memorystream.h" #include "core/fxcrt/fx_extension.h" -#include "core/fxcrt/fx_fallthrough.h" #include "core/fxcrt/fx_safe_types.h" +#include "third_party/base/compiler_specific.h" #include "third_party/base/numerics/safe_conversions.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" @@ -134,7 +134,7 @@ bool CPDF_DataAvail::CheckDocStatus() { return LoadAllFile(); case PDF_DATAAVAIL_PAGE_LATERLOAD: m_docStatus = PDF_DATAAVAIL_PAGE; - FX_FALLTHROUGH; + FALLTHROUGH; default: m_bDocAvail = true; return true; -- cgit v1.2.3