summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-06-23 23:43:10 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-06-24 14:44:07 +0200
commitee7f8ae53b2082e0d82d3efab918a2a863dd696d (patch)
tree103b0e9c9d687bb97c567bc2ac13f0824aa759d3
parent13645c5e1a819cebbda3e8021ad12884f2681ce5 (diff)
downloadmxs-utils-ee7f8ae53b2082e0d82d3efab918a2a863dd696d.tar.gz
mxs-utils-ee7f8ae53b2082e0d82d3efab918a2a863dd696d.tar.xz
fix initialization order
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--common/options.cpp4
-rw-r--r--common/options.h4
-rw-r--r--elftosb2/ElftosbAST.cpp2
-rw-r--r--elftosb2/ElftosbAST.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/common/options.cpp b/common/options.cpp
index 9f12aa6..7e8c9b2 100644
--- a/common/options.cpp
+++ b/common/options.cpp
@@ -590,8 +590,8 @@ OptionSpec::Format(char * buf, unsigned optctrls) const {
#endif
Options::Options(const char * name, const char * const optv[])
- : cmdname(name), optvec(optv), explicit_end(0), optctrls(DEFAULT),
- nextchar(NULLSTR), listopt(NULLSTR)
+ : explicit_end(0), optctrls(DEFAULT), optvec(optv), nextchar(NULLSTR),
+ listopt(NULLSTR), cmdname(name)
{
const char * basename = ::strrchr(cmdname, DIR_SEP_CHAR);
if (basename) cmdname = basename + 1;
diff --git a/common/options.h b/common/options.h
index 0c4e49c..523687f 100644
--- a/common/options.h
+++ b/common/options.h
@@ -90,10 +90,10 @@ private:
public:
OptArgvIter(const char * const argv[])
- : av(argv), ac(-1), ndx(0) {}
+ : ndx(0), ac(-1), av(argv) {}
OptArgvIter(int argc, const char * const argv[])
- : av(argv), ac(argc), ndx(0) {}
+ : ndx(0), ac(argc), av(argv) {}
virtual
~OptArgvIter(void);
diff --git a/elftosb2/ElftosbAST.cpp b/elftosb2/ElftosbAST.cpp
index 19efe57..c5c9734 100644
--- a/elftosb2/ElftosbAST.cpp
+++ b/elftosb2/ElftosbAST.cpp
@@ -591,7 +591,7 @@ ExprASTNode * SizeofOperatorASTNode::reduce(EvalContext & context)
#pragma mark = BinaryOpExprASTNode =
BinaryOpExprASTNode::BinaryOpExprASTNode(const BinaryOpExprASTNode & other)
-: ExprASTNode(other), m_left(), m_op(other.m_op), m_right()
+: ExprASTNode(other), m_left(), m_right(), m_op(other.m_op)
{
m_left = dynamic_cast<ExprASTNode*>(other.m_left->clone());
m_right = dynamic_cast<ExprASTNode*>(other.m_right->clone());
diff --git a/elftosb2/ElftosbAST.h b/elftosb2/ElftosbAST.h
index 230708d..81cc75a 100644
--- a/elftosb2/ElftosbAST.h
+++ b/elftosb2/ElftosbAST.h
@@ -473,7 +473,7 @@ public:
};
BinaryOpExprASTNode(ExprASTNode * left, operator_t op, ExprASTNode * right)
- : ExprASTNode(), m_left(left), m_op(op), m_right(right)
+ : ExprASTNode(), m_left(left), m_right(right), m_op(op)
{
}