Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Allow usage of boost::bind or std::tr1::bind on iOS

  • Loading branch information...
commit 2566251845f1f42319b96b62795fc9c1a59f50ad 1 parent c16ed5f
@pdehne pdehne authored
Showing with 15 additions and 2 deletions.
  1. +9 −1 modules/vf_core/functor/vf_Bind.h
  2. +6 −1 modules/vf_core/vf_core.h
View
10 modules/vf_core/functor/vf_Bind.h
@@ -27,9 +27,17 @@ using std::bind;
using std::placeholders::_1;
#elif JUCE_IOS || JUCE_MAC
+#if VF_USE_BOOST
+using boost::bind;
+using boost::function;
+using ::_1;
+using ::_2;
+#else
using std::tr1::bind;
using std::tr1::function;
-using namespace std::tr1::placeholders;
+using std::tr1::placeholders::_1;
+using std::tr1::placeholders::_2;
+#endif
#else
#error Unknown platform in vf_Bind.h
View
7 modules/vf_core/vf_core.h
@@ -341,9 +341,14 @@ using juce::uint8;
#include <functional>
#endif
-#if defined JUCE_IOS || defined JUCE_MAC
+#if JUCE_IOS || JUCE_MAC
+#if VF_USE_BOOST
+#include <boost/bind.hpp>
+#include <boost/function.hpp>
+#else
#include <tr1/functional>
#endif
+#endif
#include <algorithm>
#include <cfloat>
Please sign in to comment.
Something went wrong with that request. Please try again.