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.

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: weejobs macos build issues #2448

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/osgEarth/Containers
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ namespace osgEarth { namespace Util
struct PerObjectFastMap
{
PerObjectFastMap() { }
PerObjectFastMap(const std::string& name) : _mutex(name) { }
PerObjectFastMap(const std::string& name) : _mutex() { }
bool threadsafe = true;

struct Functor {
Expand Down
6 changes: 3 additions & 3 deletions src/osgEarth/weejobs.h
Original file line number Diff line number Diff line change
Expand Up @@ -391,19 +391,19 @@ namespace WEEJOBS_NAMESPACE
//! value to the continuation function. The continuation function in turn must
//! return a value (cannot be void).
template<typename FUNC, typename R = typename detail::result_of_t<FUNC(const T&, cancelable&)>>
inline future<R> then_dispatch(FUNC func, const context& con = {});
inline future<R> then_dispatch(FUNC func, const context& con );

//! Add a continuation to this future. Instead of the functor returning a value,
//! it will instead have the option of resolving the incoming future/promise object.
//! This is useful for operations that have their own way of running asynchronous code.
//! Note: for some reason when you use this variant you must specific the template
//! argument, e.g. result.then<int>(auto i, promise<int> p)
template<typename R>
inline future<R> then_dispatch(std::function<void(const T&, future<R>&)> func, const context& con = {});
inline future<R> then_dispatch(std::function<void(const T&, future<R>&)> func, const context& con);

//! Add a continuation to this future. The functor only takes an input value and has no
//! return value (fire and forget).
inline void then_dispatch(std::function<void(const T&)> func, const context& con = {});
inline void then_dispatch(std::function<void(const T&)> func, const context& con );

private:
std::shared_ptr<shared_t> _shared;
Expand Down
Loading