Skip to content

Commit 94d1ee4

Browse files
committed
Fix explicit conversion for windows
1 parent 18fe832 commit 94d1ee4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Diff for: OpenSim/Common/XsensDataReader.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ DataAdapter::OutputTables XsensDataReader::extendRead(
5555
_settings.get_rotation_representation();
5656
const std::string prefix = _settings.get_trial_prefix();
5757

58-
int n_imus = _settings.getProperty_ExperimentalSensors().size();
58+
const int n_imus = _settings.getProperty_ExperimentalSensors().size();
5959

6060
// Prepare all the file handles
6161
// format: name, filename
@@ -69,7 +69,8 @@ DataAdapter::OutputTables XsensDataReader::extendRead(
6969
(prefix + nextItem.getName() + extension);
7070

7171
// Add corresponding pair to imuStreams
72-
const auto& p = std::make_pair(nextItem.get_name_in_model(), fileName);
72+
const auto& p =
73+
std::make_pair(nextItem.get_name_in_model(), fileName.string());
7374
imuFiles.push_back(p);
7475
}
7576

@@ -124,7 +125,6 @@ DataAdapter::OutputTables XsensDataReader::extendRead(
124125
});
125126
};
126127

127-
128128
const auto& acc_h = imu_h.at("acc");
129129
const auto& gyr_h = imu_h.at("gyr");
130130
const auto& mag_h = imu_h.at("mag");

0 commit comments

Comments
 (0)