summaryrefslogtreecommitdiff
path: root/fxbarcode/common
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-08-31 13:19:18 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-08-31 17:29:26 +0000
commitbcd1e70175b6bbbcb9d9466c579e0538f34297c6 (patch)
tree9748923cde5a3e52054488fbad5f9dbb855aecc0 /fxbarcode/common
parentbc0ca1ec9b157ab8773c9043725c7422f7c1a57c (diff)
downloadpdfium-bcd1e70175b6bbbcb9d9466c579e0538f34297c6.tar.xz
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 <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxbarcode/common')
-rw-r--r--fxbarcode/common/BC_CommonBitArray.h2
-rw-r--r--fxbarcode/common/BC_CommonByteArray.cpp3
-rw-r--r--fxbarcode/common/BC_CommonByteArray.h2
-rw-r--r--fxbarcode/common/reedsolomon/BC_ReedSolomon.h2
-rw-r--r--fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h1
-rw-r--r--fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h2
6 files changed, 4 insertions, 8 deletions
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 <vector>
-#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 <algorithm>
-#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 <vector>
-#include "core/fxcrt/fx_basic.h"
-
// TODO(weili): The usage of this class should be replaced by
// std::vector<uint8_t>.
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 <memory>
#include <vector>
-#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 <memory>
-#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 <memory>
#include <vector>
-#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/cfx_unowned_ptr.h"
class CBC_ReedSolomonGF256;