Compile fixes for 10.9

3rdparty/chromaprint/src/utils.h

@@ -28,6 +28,7 @@
 #include <math.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <algorithm>
 #include <limits>
 #include <iterator>
 

ext/libclementine-common/core/closure.cpp

@@ -33,7 +33,7 @@ ClosureBase::~ClosureBase() {
 CallbackClosure::CallbackClosure(
     QObject* sender,
     const char* signal,
-    std::tr1::function<void()> callback)
+    std::function<void()> callback)
   : ClosureBase(new ObjectHelper(sender, signal, this)),
     callback_(callback) {
 }
@@ -67,7 +67,7 @@ void Unpack(QList<QGenericArgument>*) {}
 _detail::ClosureBase* NewClosure(
     QObject* sender,
     const char* signal,
-    std::tr1::function<void()> callback) {
+    std::function<void()> callback) {
   return new _detail::CallbackClosure(
       sender, signal, callback);
 }

ext/libclementine-common/core/closure.h

@@ -18,7 +18,7 @@
 #ifndef CLOSURE_H
 #define CLOSURE_H
 
-#include <tr1/functional>
+#include <functional>
 
 #include <QMetaMethod>
 #include <QObject>
@@ -158,12 +158,12 @@ class CallbackClosure : public ClosureBase {
   CallbackClosure(
       QObject* sender,
       const char* signal,
-      std::tr1::function<void()> callback);
+      std::function<void()> callback);
 
   virtual void Invoke();
 
  private:
-  std::tr1::function<void()> callback_;
+  std::function<void()> callback_;
 };
 
 }  // namespace _detail
@@ -194,13 +194,13 @@ _detail::ClosureBase* NewClosure(
 _detail::ClosureBase* NewClosure(
     QObject* sender,
     const char* signal,
-    std::tr1::function<void()> callback);
+    std::function<void()> callback);
 
 template <typename... Args>
 _detail::ClosureBase* NewClosure(
     QObject* sender,
     const char* signal,
-    std::tr1::function<void(Args...)> callback,
+    std::function<void(Args...)> callback,
     const Args&... args) {
   return NewClosure(sender, signal, boost::bind(callback, args...));
 }