mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-28 14:59:31 -05:00
Some fixes for Jenkins build
This commit is contained in:
@@ -90,7 +90,7 @@ private:
|
||||
void setState(State state);
|
||||
|
||||
std::string _name;
|
||||
std::atomic<State> _state = State::Unsynced;
|
||||
std::atomic<State> _state;
|
||||
std::mutex _callbackMutex;
|
||||
CallbackHandle _nextCallbackId = 0;
|
||||
std::unordered_map<CallbackHandle, StateChangeCallback> _stateChangeCallbacks;
|
||||
|
||||
@@ -49,6 +49,7 @@ TorrentSynchronization::TorrentSynchronization(const ghoul::Dictionary& dict,
|
||||
const std::string& synchronizationRoot,
|
||||
TorrentClient* torrentClient)
|
||||
: ResourceSynchronization(dict)
|
||||
, _enabled(false)
|
||||
, _synchronizationRoot(synchronizationRoot)
|
||||
, _torrentClient(torrentClient)
|
||||
{
|
||||
|
||||
@@ -61,7 +61,7 @@ private:
|
||||
bool hasSyncFile();
|
||||
void createSyncFile();
|
||||
|
||||
std::atomic_bool _enabled = false;
|
||||
std::atomic_bool _enabled;
|
||||
TorrentClient::TorrentId _torrentId;
|
||||
TorrentClient::TorrentProgress _progress;
|
||||
std::mutex _progressMutex;
|
||||
|
||||
@@ -51,7 +51,9 @@ TorrentError::TorrentError(std::string component)
|
||||
|
||||
namespace openspace {
|
||||
|
||||
TorrentClient::TorrentClient() {}
|
||||
TorrentClient::TorrentClient()
|
||||
: _keepRunning(true)
|
||||
{}
|
||||
|
||||
TorrentClient::~TorrentClient() {
|
||||
_keepRunning = false;
|
||||
|
||||
@@ -116,7 +116,7 @@ private:
|
||||
std::unique_ptr<libtorrent::session> _session;
|
||||
std::thread _torrentThread;
|
||||
std::mutex _mutex;
|
||||
std::atomic_bool _keepRunning = true;
|
||||
std::atomic_bool _keepRunning;
|
||||
};
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
@@ -72,7 +72,9 @@ documentation::Documentation ResourceSynchronization::Documentation() {
|
||||
};
|
||||
}
|
||||
|
||||
ResourceSynchronization::ResourceSynchronization(const ghoul::Dictionary& dict) {
|
||||
ResourceSynchronization::ResourceSynchronization(const ghoul::Dictionary& dict)
|
||||
: _state(State::Unsynced)
|
||||
{
|
||||
_name = dict.value<std::string>(KeyName);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user