StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

get the initialisation order right

Browse Source 
- members reordered to reduce sizeof classes (due to alignment). ctors needed to be updated for this
This commit is contained in:
Crzyrndm 2018-07-29 14:37:08 +12:00
parent 4124dd78e0
commit e01f461b64
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/worksheet/cell_iterator.cpp
View File

@ -30,12 +30,12 @@ namespace xlnt {
cell_iterator::cell_iterator(worksheet ws, const cell_reference &cursor,
const range_reference &bounds, major_order order, bool skip_null, bool wrap)
: ws_(ws),
cursor_(cursor),
bounds_(bounds),
: skip_null_(skip_null),
wrap_(wrap),
order_(order),
skip_null_(skip_null),
wrap_(wrap)
ws_(ws),
cursor_(cursor),
bounds_(bounds)
{
if (skip_null && !ws.has_cell(cursor_))
{
@ -45,12 +45,12 @@ cell_iterator::cell_iterator(worksheet ws, const cell_reference &cursor,
const_cell_iterator::const_cell_iterator(worksheet ws, const cell_reference &cursor,
const range_reference &bounds, major_order order, bool skip_null, bool wrap)
: ws_(ws),
cursor_(cursor),
bounds_(bounds),
: skip_null_(skip_null),
wrap_(wrap),
order_(order),
skip_null_(skip_null),
wrap_(wrap)
ws_(ws),
cursor_(cursor),
bounds_(bounds)
{
if (skip_null && !ws.has_cell(cursor_))
{

16
source/worksheet/range_iterator.cpp
View File

@ -40,11 +40,11 @@ const range_iterator::reference range_iterator::operator*() const
range_iterator::range_iterator(worksheet &ws, const cell_reference &cursor,
const range_reference &bounds, major_order order, bool skip_null)
: ws_(ws),
cursor_(cursor),
bounds_(bounds),
: skip_null_(skip_null),
order_(order),
skip_null_(skip_null)
ws_(ws),
cursor_(cursor),
bounds_(bounds)
{
if (skip_null_ && (**this).empty())
{
@ -156,11 +156,11 @@ range_iterator range_iterator::operator++(int)
const_range_iterator::const_range_iterator(const worksheet &ws, const cell_reference &cursor,
const range_reference &bounds, major_order order, bool skip_null)
: ws_(ws.d_),
cursor_(cursor),
bounds_(bounds),
: skip_null_(skip_null),
order_(order),
skip_null_(skip_null)
ws_(ws.d_),
cursor_(cursor),
bounds_(bounds)
{
if (skip_null_ && (**this).empty())
{