From bcd1e70175b6bbbcb9d9466c579e0538f34297c6 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 31 Aug 2017 13:19:18 -0400 Subject: Remove fx_basic.h This CL removes the fx_basic.h header and fixes up includes as needed. Change-Id: I49af32a8327bdbcda40c50a61ffbd75d06609040 Reviewed-on: https://pdfium-review.googlesource.com/12670 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fxbarcode/common/BC_CommonBitArray.h | 2 -- fxbarcode/common/BC_CommonByteArray.cpp | 3 ++- fxbarcode/common/BC_CommonByteArray.h | 2 -- fxbarcode/common/reedsolomon/BC_ReedSolomon.h | 2 +- fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h | 1 - fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h | 2 +- 6 files changed, 4 insertions(+), 8 deletions(-) (limited to 'fxbarcode/common') diff --git a/fxbarcode/common/BC_CommonBitArray.h b/fxbarcode/common/BC_CommonBitArray.h index f3d0a5ed83..1f98e54e53 100644 --- a/fxbarcode/common/BC_CommonBitArray.h +++ b/fxbarcode/common/BC_CommonBitArray.h @@ -9,8 +9,6 @@ #include -#include "core/fxcrt/fx_basic.h" - class CBC_CommonBitArray { public: explicit CBC_CommonBitArray(CBC_CommonBitArray* array); diff --git a/fxbarcode/common/BC_CommonByteArray.cpp b/fxbarcode/common/BC_CommonByteArray.cpp index 80ae07d1ad..d66568c596 100644 --- a/fxbarcode/common/BC_CommonByteArray.cpp +++ b/fxbarcode/common/BC_CommonByteArray.cpp @@ -19,10 +19,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include "fxbarcode/common/BC_CommonByteArray.h" #include -#include "fxbarcode/common/BC_CommonByteArray.h" +#include "core/fxcrt/fx_memory.h" CBC_CommonByteArray::CBC_CommonByteArray() { m_bytes = nullptr; diff --git a/fxbarcode/common/BC_CommonByteArray.h b/fxbarcode/common/BC_CommonByteArray.h index 9270adcf42..86b4ea1544 100644 --- a/fxbarcode/common/BC_CommonByteArray.h +++ b/fxbarcode/common/BC_CommonByteArray.h @@ -9,8 +9,6 @@ #include -#include "core/fxcrt/fx_basic.h" - // TODO(weili): The usage of this class should be replaced by // std::vector. class CBC_CommonByteArray { diff --git a/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/fxbarcode/common/reedsolomon/BC_ReedSolomon.h index 2838e13cee..d4e3ee8881 100644 --- a/fxbarcode/common/reedsolomon/BC_ReedSolomon.h +++ b/fxbarcode/common/reedsolomon/BC_ReedSolomon.h @@ -10,7 +10,7 @@ #include #include -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/cfx_unowned_ptr.h" class CBC_ReedSolomonGF256; class CBC_ReedSolomonGF256Poly; diff --git a/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h index 6d8225dfb0..693d943042 100644 --- a/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h +++ b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h @@ -9,7 +9,6 @@ #include -#include "core/fxcrt/fx_basic.h" #include "fxbarcode/utils.h" class CBC_ReedSolomonGF256Poly; diff --git a/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h index f7aea2bf53..4730625bf8 100644 --- a/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h +++ b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h @@ -10,7 +10,7 @@ #include #include -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/cfx_unowned_ptr.h" class CBC_ReedSolomonGF256; -- cgit v1.2.3