Skip to content

Commit

Permalink
Merge PR #3276: GlobalShortcut_win: fix std::/boost:: confusion in co…
Browse files Browse the repository at this point in the history
…mment.
  • Loading branch information
davidebeatrici committed Dec 2, 2017
2 parents 6bfd039 + 53912f6 commit 742a5d9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/mumble/GlobalShortcut_win.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "mumble_pch.hpp"

// MinGW does not support boost::future/boost::promise
// MinGW does not support std::future/std::promise
// at present. Use Boost's implementation for now.
#define BOOST_THREAD_VERSION 4
#include <boost/thread.hpp>
Expand Down

0 comments on commit 742a5d9

Please sign in to comment.