Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build errors #110

Closed
wants to merge 3 commits into from
Closed

Fix build errors #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b6df02
Fix missing library
incebellipipo Feb 11, 2025
118ab1e
Fix syntax error
incebellipipo Feb 11, 2025
031eafb
Merge branch 'qualisys:master' into master
incebellipipo Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions MarkupSerializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#define _CRT_SECURE_NO_WARNINGS

#include "MarkupSerializer.h"

#include <cstring>
#include <algorithm>
#include <map>

Expand Down Expand Up @@ -2833,7 +2833,7 @@ bool CMarkupDeserializer::DeserializeSkeletonSettings(bool pSkeletonGlobalData,
return true;
} // ReadSkeletonSettings

namespace
namespace
{
bool ReadXmlFov(std::string name, CMarkup& oXML, SCalibrationFov& fov)
{
Expand Down Expand Up @@ -3188,7 +3188,7 @@ std::string CMarkupSerializer::SetExtTimeBaseSettings(const bool* pbEnabled, con
AddXMLElementUnsignedInt(&oXML, "Signal_Shutter_Delay", pnSignalShutterDelay);
AddXMLElementFloat(&oXML, "Non_Periodic_Timeout", pfNonPeriodicTimeout, 3);

oXML.OutOfElem(); // External_Time_Base
oXML.OutOfElem(); // External_Time_Base
oXML.OutOfElem(); // General
oXML.OutOfElem(); // QTM_Settings

Expand Down Expand Up @@ -3383,7 +3383,7 @@ std::string CMarkupSerializer::SetCameraSyncOutSettings(const unsigned int pCame
oXML.AddElem("Mode", "System live time");
break;
default:
return false; // Should never happen
return std::string(); // Should never happen
}

if (*peSyncOutMode == ModeMultiplier ||
Expand Down
1 change: 1 addition & 0 deletions Settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "Settings.h"
#include "algorithm"

const char* qualisys_cpp_sdk::SkeletonDofToStringSettings(EDegreeOfFreedom dof)
{
Expand Down