Make clang (OSX) happy again

dannywarren · Jun 24, 2015 · a3ba5c0 · a3ba5c0
1 parent 3f2b5dc
commit a3ba5c0
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -34,6 +34,7 @@
 /* copyright --> */
 #include "IteratableChunkChecksumValidator.h"
 
+#include <array>
 #include <cstring>
 #include <cstdlib>
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -3,6 +3,7 @@
 #include <fstream>
 #include <cppunit/extensions/HelperMacros.h>
 
+#include "a2functional.h"
 #include "File.h"
 #include "DefaultDiskWriter.h"