From a3ba5c058879153dfeb4465dd080a199a1802f4a Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Wed, 24 Jun 2015 14:24:10 +0200
Subject: [PATCH] Make clang (OSX) happy again

---
 src/DHTInteractionCommand.cc             | 3 +++
 src/FtpConnection.cc                     | 1 +
 src/GZipEncoder.cc                       | 1 +
 src/GenericParser.h                      | 1 +
 src/IOFile.cc                            | 1 +
 src/IteratableChecksumValidator.cc       | 1 +
 src/IteratableChunkChecksumValidator.cc  | 1 +
 src/MSEHandshake.cc                      | 1 +
 src/Piece.cc                             | 1 +
 src/TimerA2.h                            | 2 +-
 src/XmlParser.cc                         | 3 +++
 src/message_digest_helper.cc             | 1 +
 src/metalink_helper.cc                   | 3 +++
 src/util.cc                              | 1 +
 test/FallocFileAllocationIteratorTest.cc | 1 +
 15 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/DHTInteractionCommand.cc b/src/DHTInteractionCommand.cc
index 732ba29e8c..fb1e35b0e0 100644
--- a/src/DHTInteractionCommand.cc
+++ b/src/DHTInteractionCommand.cc
@@ -33,6 +33,9 @@
  */
 /* copyright --> */
 #include "DHTInteractionCommand.h"
+
+#include <array>
+
 #include "DownloadEngine.h"
 #include "RecoverableException.h"
 #include "DHTMessageDispatcher.h"
diff --git a/src/FtpConnection.cc b/src/FtpConnection.cc
index e008f7218f..b92afe20bd 100644
--- a/src/FtpConnection.cc
+++ b/src/FtpConnection.cc
@@ -34,6 +34,7 @@
 /* copyright --> */
 #include "FtpConnection.h"
 
+#include <array>
 #include <cstring>
 #include <cstdio>
 #include <cassert>
diff --git a/src/GZipEncoder.cc b/src/GZipEncoder.cc
index 323faf1924..0a46be5a0f 100644
--- a/src/GZipEncoder.cc
+++ b/src/GZipEncoder.cc
@@ -34,6 +34,7 @@
 /* copyright --> */
 #include "GZipEncoder.h"
 
+#include <array>
 #include <cstring>
 
 #include "fmt.h"
diff --git a/src/GenericParser.h b/src/GenericParser.h
index 80db5c5f8c..81805d4c44 100644
--- a/src/GenericParser.h
+++ b/src/GenericParser.h
@@ -35,6 +35,7 @@
 #ifndef D_GENERIC_PARSER_H
 #define D_GENERIC_PARSER_H
 
+#include <array>
 #include "common.h"
 #include "a2io.h"
 #include "util.h"
diff --git a/src/IOFile.cc b/src/IOFile.cc
index 9df2ebc40c..32baa55d51 100644
--- a/src/IOFile.cc
+++ b/src/IOFile.cc
@@ -34,6 +34,7 @@
 /* copyright --> */
 #include "IOFile.h"
 
+#include <array>
 #include <cstring>
 #include <cstdarg>
 #include <ostream>
diff --git a/src/IteratableChecksumValidator.cc b/src/IteratableChecksumValidator.cc
index f5d29b1558..ee0f040d2e 100644
--- a/src/IteratableChecksumValidator.cc
+++ b/src/IteratableChecksumValidator.cc
@@ -34,6 +34,7 @@
 /* copyright --> */
 #include "IteratableChecksumValidator.h"
 
+#include <array>
 #include <cstdlib>
 
 #include "util.h"
diff --git a/src/IteratableChunkChecksumValidator.cc b/src/IteratableChunkChecksumValidator.cc
index 5d37e9770b..cdde1d5427 100644
--- a/src/IteratableChunkChecksumValidator.cc
+++ b/src/IteratableChunkChecksumValidator.cc
@@ -34,6 +34,7 @@
 /* copyright --> */
 #include "IteratableChunkChecksumValidator.h"
 
+#include <array>
 #include <cstring>
 #include <cstdlib>
 
diff --git a/src/MSEHandshake.cc b/src/MSEHandshake.cc
index f6a6d1adcc..3cc45f7cd0 100644
--- a/src/MSEHandshake.cc
+++ b/src/MSEHandshake.cc
@@ -34,6 +34,7 @@
 /* copyright --> */
 #include "MSEHandshake.h"
 
+#include <array>
 #include <cstring>
 #include <cassert>
 
diff --git a/src/Piece.cc b/src/Piece.cc
index 5445365790..109e89c604 100644
--- a/src/Piece.cc
+++ b/src/Piece.cc
@@ -34,6 +34,7 @@
 /* copyright --> */
 #include "Piece.h"
 
+#include <array>
 #include <cassert>
 
 #include "util.h"
diff --git a/src/TimerA2.h b/src/TimerA2.h
index e229dcd721..bf91c262e2 100644
--- a/src/TimerA2.h
+++ b/src/TimerA2.h
@@ -93,7 +93,7 @@ class Timer {
 
   const Clock::time_point& getTime() const { return tp_; }
 
-  constexpr static Timer zero() { return Timer(0_s); }
+  static Timer zero() { return Timer(0_s); }
 
 private:
   Clock::time_point tp_;
diff --git a/src/XmlParser.cc b/src/XmlParser.cc
index 546ff7468e..f49a5a5cf5 100644
--- a/src/XmlParser.cc
+++ b/src/XmlParser.cc
@@ -33,6 +33,9 @@
  */
 /* copyright --> */
 #include "XmlParser.h"
+
+#include <array>
+
 #include "a2io.h"
 #include "util.h"
 
diff --git a/src/message_digest_helper.cc b/src/message_digest_helper.cc
index be612aace9..acb39a023e 100644
--- a/src/message_digest_helper.cc
+++ b/src/message_digest_helper.cc
@@ -34,6 +34,7 @@
 /* copyright --> */
 #include "message_digest_helper.h"
 
+#include <array>
 #include <cstring>
 #include <cstdlib>
 
diff --git a/src/metalink_helper.cc b/src/metalink_helper.cc
index 09264b1e51..d13cfc24e5 100644
--- a/src/metalink_helper.cc
+++ b/src/metalink_helper.cc
@@ -33,6 +33,9 @@
  */
 /* copyright --> */
 #include "metalink_helper.h"
+
+#include <array>
+
 #include "Option.h"
 #include "MetalinkEntry.h"
 #include "MetalinkParserStateMachine.h"
diff --git a/src/util.cc b/src/util.cc
index 5e42389df8..a49547ca04 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -53,6 +53,7 @@
 #  include <pwd.h>
 #endif // HAVE_PWD_H
 
+#include <array>
 #include <cerrno>
 #include <cassert>
 #include <cstring>
diff --git a/test/FallocFileAllocationIteratorTest.cc b/test/FallocFileAllocationIteratorTest.cc
index 14dfc6e87d..1fea7ce5ce 100644
--- a/test/FallocFileAllocationIteratorTest.cc
+++ b/test/FallocFileAllocationIteratorTest.cc
@@ -3,6 +3,7 @@
 #include <fstream>
 #include <cppunit/extensions/HelperMacros.h>
 
+#include "a2functional.h"
 #include "File.h"
 #include "DefaultDiskWriter.h"