Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Turri <enricoturri@seznam.cz>2019-10-21 16:20:36 +0300
committerEnrico Turri <enricoturri@seznam.cz>2019-10-21 16:20:36 +0300
commitd4f190a0c16292aefa8ecae18c0fc6a658c57adf (patch)
tree7f075e42ac2cce1f69ce6166cecf36e29b935e8f /src/slic3r/GUI/Mouse3DController.cpp
parent3ce3f33c9cfce023af856998ab9619641f69917d (diff)
Fixed build on Linux and Mac
Diffstat (limited to 'src/slic3r/GUI/Mouse3DController.cpp')
-rw-r--r--src/slic3r/GUI/Mouse3DController.cpp17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/slic3r/GUI/Mouse3DController.cpp b/src/slic3r/GUI/Mouse3DController.cpp
index fae62ca7e..78c0b6227 100644
--- a/src/slic3r/GUI/Mouse3DController.cpp
+++ b/src/slic3r/GUI/Mouse3DController.cpp
@@ -335,10 +335,17 @@ bool Mouse3DController::connect_device()
// Searches for 1st connected 3Dconnexion device
struct DeviceData
{
- std::string path{ "" };
- int interface_number{ 0 };
- unsigned short usage_page{ 0 };
- unsigned short usage{ 0 };
+ std::string path;
+ int interface_number;
+ unsigned short usage_page;
+ unsigned short usage;
+
+ DeviceData()
+ : path(""), interface_number(0), usage_page(0), usage(0)
+ {}
+ DeviceData(const std::string& path, int interface_number, unsigned short usage_page, unsigned short usage)
+ : path(path), interface_number(interface_number), usage_page(usage_page), usage(usage)
+ {}
};
#if ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT
@@ -397,7 +404,7 @@ bool Mouse3DController::connect_device()
if (it == detected_devices.end())
it = detected_devices.insert(DetectedDevices::value_type(detected_device, DeviceDataList())).first;
- it->second.push_back({ current->path, current->interface_number, current->usage_page, current->usage });
+ it->second.emplace_back(current->path, current->interface_number, current->usage_page, current->usage);
}
}
}