Declare const pdfium::span consistently.
const pdfium::span<T> var_name is winning the popularity contest vs.
pdfium::span<T> const var_name.
Change-Id: Ic7e241bea1c5f3d83babdc01288d95a360ffa9a8
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/59533
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxcodec/fax/faxmodule.cpp b/core/fxcodec/fax/faxmodule.cpp
index 6d61857..d8df9e1 100644
--- a/core/fxcodec/fax/faxmodule.cpp
+++ b/core/fxcodec/fax/faxmodule.cpp
@@ -478,7 +478,7 @@
bool m_bByteAlign = false;
const bool m_bEndOfLine;
const bool m_bBlack;
- pdfium::span<const uint8_t> const m_SrcSpan;
+ const pdfium::span<const uint8_t> m_SrcSpan;
std::vector<uint8_t> m_ScanlineBuf;
std::vector<uint8_t> m_RefBuf;
};
diff --git a/core/fxcodec/flate/flatemodule.cpp b/core/fxcodec/flate/flatemodule.cpp
index 31aa519..587771e 100644
--- a/core/fxcodec/flate/flatemodule.cpp
+++ b/core/fxcodec/flate/flatemodule.cpp
@@ -605,7 +605,7 @@
protected:
std::unique_ptr<z_stream, FlateDeleter> m_pFlate;
- pdfium::span<const uint8_t> const m_SrcBuf;
+ const pdfium::span<const uint8_t> m_SrcBuf;
std::unique_ptr<uint8_t, FxFreeDeleter> const m_pScanline;
};
diff --git a/core/fxcodec/jbig2/JBig2_BitStream.h b/core/fxcodec/jbig2/JBig2_BitStream.h
index 50a80ed..9e6efc4 100644
--- a/core/fxcodec/jbig2/JBig2_BitStream.h
+++ b/core/fxcodec/jbig2/JBig2_BitStream.h
@@ -44,7 +44,7 @@
void AdvanceBit();
uint32_t LengthInBits() const;
- pdfium::span<const uint8_t> const m_Span;
+ const pdfium::span<const uint8_t> m_Span;
uint32_t m_dwByteIdx = 0;
uint32_t m_dwBitIdx = 0;
const uint32_t m_dwObjNum;
diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h
index 22063c3..057c26a 100644
--- a/xfa/fxfa/parser/cxfa_node.h
+++ b/xfa/fxfa/parser/cxfa_node.h
@@ -481,8 +481,8 @@
CFX_XMLDocument* GetXMLDocument() const;
- pdfium::span<const PropertyData> const m_Properties;
- pdfium::span<const AttributeData> const m_Attributes;
+ const pdfium::span<const PropertyData> m_Properties;
+ const pdfium::span<const AttributeData> m_Attributes;
const uint32_t m_ValidPackets;
UnownedPtr<CFX_XMLNode> xml_node_;
const XFA_PacketType m_ePacket;