[Bf-blender-cvs] [e5a74f3ad31] blender2.8: Audaspace: Fix -Wreorder warning
Sergey Sharybin
noreply at git.blender.org
Tue Nov 28 15:09:13 CET 2017
Commit: e5a74f3ad31e1ee55e086de682c7d01b8d27697e
Author: Sergey Sharybin
Date: Tue Nov 28 13:09:15 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBe5a74f3ad31e1ee55e086de682c7d01b8d27697e
Audaspace: Fix -Wreorder warning
Makes building less noisy, helps catching real introduced warnings/errors.
@xeXyon, mind having a look here and possibly apply to upstream? :)
===================================================================
M extern/audaspace/src/fx/DynamicMusic.cpp
M extern/audaspace/src/fx/PlaybackCategory.cpp
===================================================================
diff --git a/extern/audaspace/src/fx/DynamicMusic.cpp b/extern/audaspace/src/fx/DynamicMusic.cpp
index b77cd749576..2b0acc06fbc 100644
--- a/extern/audaspace/src/fx/DynamicMusic.cpp
+++ b/extern/audaspace/src/fx/DynamicMusic.cpp
@@ -25,7 +25,7 @@
AUD_NAMESPACE_BEGIN
DynamicMusic::DynamicMusic(std::shared_ptr<IDevice> device) :
-m_device(device), m_fadeTime(1.0f)
+m_fadeTime(1.0f), m_device(device)
{
m_id = 0;
m_transitioning = false;
diff --git a/extern/audaspace/src/fx/PlaybackCategory.cpp b/extern/audaspace/src/fx/PlaybackCategory.cpp
index e09a74c4017..1891be96d16 100644
--- a/extern/audaspace/src/fx/PlaybackCategory.cpp
+++ b/extern/audaspace/src/fx/PlaybackCategory.cpp
@@ -25,7 +25,7 @@ struct HandleData {
};
PlaybackCategory::PlaybackCategory(std::shared_ptr<IDevice> device) :
- m_device(device), m_volumeStorage(std::make_shared<VolumeStorage>(1.0f)), m_status(STATUS_PLAYING), m_currentID(0)
+ m_currentID(0), m_device(device), m_status(STATUS_PLAYING), m_volumeStorage(std::make_shared<VolumeStorage>(1.0f))
{
}
More information about the Bf-blender-cvs
mailing list