Fix ordering in member initializer lists.

diff --git a/src/AS_02_PHDR.cpp b/src/AS_02_PHDR.cpp
index 71f6b64b53deb9de747e838edf08c76ae6becc65..0fc6baa3e4b7f1c47f14c51afa6af2faf3a5a782 100644 (file)
--- a/src/AS_02_PHDR.cpp
+++ b/src/AS_02_PHDR.cpp
@@ -355,7 +355,7 @@ public:
   byte_t            m_EssenceUL[SMPTE_UL_LENGTH];
   byte_t            m_MetadataUL[SMPTE_UL_LENGTH];
 
-  h__Writer(const Dictionary *d) : h__AS02WriterFrame(d), m_EssenceSubDescriptor(0), m_MetadataTrackSubDescriptor(0) {
+  h__Writer(const Dictionary *d) : h__AS02WriterFrame(d), m_MetadataTrackSubDescriptor(0), m_EssenceSubDescriptor(0) {
     memset(m_EssenceUL, 0, SMPTE_UL_LENGTH);
     memset(m_MetadataUL, 0, SMPTE_UL_LENGTH);
   }

diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h
index 249ca2fb771826bbe66ffa642c87200232f3dbec..9d3fee90c1604a173061741cbcbde49ca5b2f411 100755 (executable)
--- a/src/AS_DCP_internal.h
+++ b/src/AS_DCP_internal.h
@@ -226,7 +226,7 @@ extern MXF::RIP *g_RIP;
        Kumu::fpos_t       m_LastPosition;
 
       TrackFileReader(const Dictionary* d, const Kumu::IFileReaderFactory& fileReaderFactory) :
-       m_HeaderPart(m_Dict), m_IndexAccess(m_Dict), m_RIP(m_Dict), m_Dict(d)
+       m_Dict(d), m_HeaderPart(m_Dict), m_IndexAccess(m_Dict), m_RIP(m_Dict)
          {
            default_md_object_init();
            m_File = fileReaderFactory.CreateFileReader();

diff --git a/src/MXF.cpp b/src/MXF.cpp
index ebb3013d930f78beaf5ab3522be06599d5abe07a..cb873d948da3bf88fe5c182412be1585161aa878 100755 (executable)
--- a/src/MXF.cpp
+++ b/src/MXF.cpp
@@ -1896,7 +1896,7 @@ ASDCP::MXF::decode_mca_string(const std::string& s, const mca_label_map_t& label
 }
 
 //
-ASDCP::MXF::ASDCP_MCAConfigParser::ASDCP_MCAConfigParser(const Dictionary* d) : m_Dict(d), m_ChannelCount(0)
+ASDCP::MXF::ASDCP_MCAConfigParser::ASDCP_MCAConfigParser(const Dictionary* d) : m_ChannelCount(0), m_Dict(d)
 {
   typedef mca_label_map_t::value_type pair;
   m_LabelMap.insert(pair("L",     label_traits("Left"                              , true,  m_Dict->ul(MDD_DCAudioChannel_L))));

diff --git a/src/PCMDataProviders.cpp b/src/PCMDataProviders.cpp
index 7d2c1524b934085b74cf90f5521c0c86f7a6558c..8eb968101dcfaa467d019079fe66ec360cdc4500 100644 (file)
--- a/src/PCMDataProviders.cpp
+++ b/src/PCMDataProviders.cpp
@@ -40,7 +40,7 @@ ASDCP::PCMDataProviderInterface::~PCMDataProviderInterface() {}
 
 //
 ASDCP::WAVDataProvider::WAVDataProvider()
-    : m_Parser(), m_FB(), m_ADesc(), m_SampleSize(0), m_ptr(NULL)
+    : m_Parser(), m_FB(), m_ADesc(), m_ptr(NULL), m_SampleSize(0)
 {}
 
 ASDCP::WAVDataProvider::~WAVDataProvider()

diff --git a/src/asdcp-wrap.cpp b/src/asdcp-wrap.cpp
index cd47757bf343f2d866d8ec836583f9d91ded29cc..0984badc3e611587573e25686fa44b7d49ba7853 100755 (executable)
--- a/src/asdcp-wrap.cpp
+++ b/src/asdcp-wrap.cpp
@@ -315,19 +315,20 @@ public:
 
   //
   CommandOptions(int argc, const char** argv) :
-    error_flag(true), key_flag(false), key_id_flag(false), asset_id_flag(false),
+    error_flag(true), key_flag(false), asset_id_flag(false),
     encrypt_header_flag(true), write_hmac(true),
     verbose_flag(false), fb_dump_size(0),
     no_write_flag(false), version_flag(false), help_flag(false), stereo_image_flag(false),
     write_partial_pcm_flag(false), start_frame(0),
     duration(0xffffffff), use_smpte_labels(false), j2c_pedantic(true),
     fb_size(FRAME_BUFFER_SIZE),
+    key_id_flag(false),
     channel_fmt(PCM::CF_NONE),
-    ffoa(0), max_channel_count(10), max_object_count(118), // hard-coded sample atmos properties
-    dolby_atmos_sync_flag(false),
     show_ul_values_flag(false),
-    mca_config(g_dict),
-    use_interop_sound_wtf(false)
+    dolby_atmos_sync_flag(false),
+    ffoa(0), max_channel_count(10), max_object_count(118), // hard-coded sample atmos properties
+    use_interop_sound_wtf(false),
+    mca_config(g_dict)
   {
     memset(key_value, 0, KeyLen);
     memset(key_id_value, 0, UUIDlen);