Skip to content

Commit 04ab39c

Browse files
authored
Reorder initializers to silence a warning. (#1960)
Signed-off-by: Joshua Minor <[email protected]>
1 parent 829a913 commit 04ab39c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/opentimelineio/color.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ Color::Color(
1414
double const b,
1515
double const a,
1616
std::string const& name)
17-
: _name(name),
18-
_r(r),
17+
: _r(r),
1918
_g(g),
2019
_b(b),
21-
_a(a) {}
20+
_a(a),
21+
_name(name) {}
2222

23-
Color::Color(Color const& other) : _name(other.name()),
24-
_r(other.r()),
23+
Color::Color(Color const& other) : _r(other.r()),
2524
_g(other.g()),
2625
_b(other.b()),
27-
_a(other.a()) {}
26+
_a(other.a()),
27+
_name(other.name()) {}
2828

2929
const Color Color::pink(1.0, 0.0, 1.0, 1.0, "Pink");
3030
const Color Color::red(1.0, 0.0, 0.0, 1.0, "Red");

src/opentimelineio/item.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Item::Item(
2222
, _source_range(source_range)
2323
, _effects(effects.begin(), effects.end())
2424
, _markers(markers.begin(), markers.end())
25-
, _enabled(enabled)
2625
, _color(color)
26+
, _enabled(enabled)
2727
{}
2828

2929
Item::~Item()

0 commit comments

Comments
 (0)