Skip to content

Commit 8d5df40

Browse files
authored
Fixes issue when compiling with whole program optimization (#118)
1 parent 2acacb5 commit 8d5df40

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

RTClientSDK.vcxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
<SubSystem>Console</SubSystem>
104104
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
105105
<TargetMachine>MachineX86</TargetMachine>
106+
<OptimizeReferences>true</OptimizeReferences>
106107
</Link>
107108
<PostBuildEvent>
108109
<Command>
@@ -127,6 +128,7 @@
127128
<GenerateDebugInformation>true</GenerateDebugInformation>
128129
<SubSystem>Console</SubSystem>
129130
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
131+
<OptimizeReferences>true</OptimizeReferences>
130132
</Link>
131133
<PostBuildEvent>
132134
<Command>
@@ -176,7 +178,7 @@
176178
<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
177179
<GenerateDebugInformation>false</GenerateDebugInformation>
178180
<SubSystem>Console</SubSystem>
179-
<OptimizeReferences>false</OptimizeReferences>
181+
<OptimizeReferences>true</OptimizeReferences>
180182
<EnableCOMDATFolding>true</EnableCOMDATFolding>
181183
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
182184
</Link>

Settings.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
#include "Settings.h"
22

3+
namespace
4+
{
5+
constexpr auto DEGREES_OF_FREEDOM =
6+
{
7+
std::make_pair(qualisys_cpp_sdk::EDegreeOfFreedom::RotationX, "RotationX"),
8+
std::make_pair(qualisys_cpp_sdk::EDegreeOfFreedom::RotationY, "RotationY"),
9+
std::make_pair(qualisys_cpp_sdk::EDegreeOfFreedom::RotationZ, "RotationZ"),
10+
std::make_pair(qualisys_cpp_sdk::EDegreeOfFreedom::TranslationX, "TranslationX"),
11+
std::make_pair(qualisys_cpp_sdk::EDegreeOfFreedom::TranslationY, "TranslationY"),
12+
std::make_pair(qualisys_cpp_sdk::EDegreeOfFreedom::TranslationZ, "TranslationZ")
13+
};
14+
}
15+
316
const char* qualisys_cpp_sdk::SkeletonDofToStringSettings(EDegreeOfFreedom dof)
417
{
518
auto it = std::find_if(DEGREES_OF_FREEDOM.begin(), DEGREES_OF_FREEDOM.end(), [&](const auto& DEGREE_OF_FREEDOM) { return (DEGREE_OF_FREEDOM.first == dof); });

Settings.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -624,16 +624,6 @@ namespace qualisys_cpp_sdk
624624
std::vector<SSettingsSkeletonSegment> segments;
625625
};
626626

627-
constexpr auto DEGREES_OF_FREEDOM =
628-
{
629-
std::make_pair(qualisys_cpp_sdk::EDegreeOfFreedom::RotationX, "RotationX"),
630-
std::make_pair(qualisys_cpp_sdk::EDegreeOfFreedom::RotationY, "RotationY"),
631-
std::make_pair(qualisys_cpp_sdk::EDegreeOfFreedom::RotationZ, "RotationZ"),
632-
std::make_pair(qualisys_cpp_sdk::EDegreeOfFreedom::TranslationX, "TranslationX"),
633-
std::make_pair(qualisys_cpp_sdk::EDegreeOfFreedom::TranslationY, "TranslationY"),
634-
std::make_pair(qualisys_cpp_sdk::EDegreeOfFreedom::TranslationZ, "TranslationZ")
635-
};
636-
637627
DLL_EXPORT const char* SkeletonDofToStringSettings(EDegreeOfFreedom dof);
638628

639629
DLL_EXPORT EDegreeOfFreedom SkeletonStringToDofSettings(const std::string& str);

0 commit comments

Comments
 (0)