From b17b075361ceb9cf31da36db32731881f9fb186e Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Mon, 28 Oct 2013 17:30:52 +0100
Subject: [PATCH] Compile fixes for 10.9

---
 3rdparty/chromaprint/src/utils.h          |  1 +
 ext/libclementine-common/core/closure.cpp |  4 ++--
 ext/libclementine-common/core/closure.h   | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/3rdparty/chromaprint/src/utils.h b/3rdparty/chromaprint/src/utils.h
index 47c6b9827..76fb2402b 100644
--- a/3rdparty/chromaprint/src/utils.h
+++ b/3rdparty/chromaprint/src/utils.h
@@ -28,6 +28,7 @@
 #include <math.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <algorithm>
 #include <limits>
 #include <iterator>
 
diff --git a/ext/libclementine-common/core/closure.cpp b/ext/libclementine-common/core/closure.cpp
index ccca3bae1..e2c27c13f 100644
--- a/ext/libclementine-common/core/closure.cpp
+++ b/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);
 }
diff --git a/ext/libclementine-common/core/closure.h b/ext/libclementine-common/core/closure.h
index 63ed9936b..2244a4a69 100644
--- a/ext/libclementine-common/core/closure.h
+++ b/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...));
 }