diff --git a/src/osgEarth/Containers b/src/osgEarth/Containers index 8330507597..29a205ed3b 100644 --- a/src/osgEarth/Containers +++ b/src/osgEarth/Containers @@ -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 { diff --git a/src/osgEarth/weejobs.h b/src/osgEarth/weejobs.h index 606cacc5bc..024a69572d 100644 --- a/src/osgEarth/weejobs.h +++ b/src/osgEarth/weejobs.h @@ -391,7 +391,7 @@ namespace WEEJOBS_NAMESPACE //! value to the continuation function. The continuation function in turn must //! return a value (cannot be void). template> - inline future then_dispatch(FUNC func, const context& con = {}); + inline future 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. @@ -399,11 +399,11 @@ namespace WEEJOBS_NAMESPACE //! Note: for some reason when you use this variant you must specific the template //! argument, e.g. result.then(auto i, promise p) template - inline future then_dispatch(std::function&)> func, const context& con = {}); + inline future then_dispatch(std::function&)> 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 func, const context& con = {}); + inline void then_dispatch(std::function func, const context& con ); private: std::shared_ptr _shared;