From 692c03ffe2bd7033dc2e31163095efebace7e642 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 16 Dec 2015 19:07:14 -0800 Subject: Merge to XFA: Make clang_warning_flags work for standalone builds. Also fix a newly introduced override warning. Also define a host_clang GYP variable. TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/1532723003 . Review URL: https://codereview.chromium.org/1533763002 . (cherry picked from commit e096ca507db9944aebc47d6c2cc1c6fab39498c5) (cherry picked from commit 0a9158b99a2002fb82301ebec20dbc23b3fc084c) Review URL: https://codereview.chromium.org/1535603003 . --- core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp index aba639c850..d3187c1ff4 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp @@ -43,7 +43,7 @@ class CFX_TestBufferRead : public IFX_FileRead { void Release() override { delete this; } // IFX_FileRead - virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) { + FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override { if (offset < 0 || offset + size > total_size_) { return FALSE; } @@ -51,7 +51,7 @@ class CFX_TestBufferRead : public IFX_FileRead { memcpy(buffer, buffer_ + offset, size); return TRUE; } - virtual FX_FILESIZE GetSize() { return (FX_FILESIZE)total_size_; }; + FX_FILESIZE GetSize() override { return (FX_FILESIZE)total_size_; }; protected: const unsigned char* buffer_; -- cgit v1.2.3