This commit addresses warnings emitted from -Wreorder in the C++ src. Signed-off-by: Noel Eck <noel.eck@intel.com>