Build fixes/workarounds to support Visual Studio 2013 build, which has trouble with some new C++11 constructs. (#581)

3 files changed, 4 insertions, 3 deletions

diff --git a/src/support/archive.cpp b/src/support/archive.cpp
index 126f4e2ce..487a77376 100644
--- a/src/support/archive.cpp
+++ b/src/support/archive.cpp
@@ -60,7 +60,7 @@ uint32_t ArchiveMemberHeader::getSize() const {
   return static_cast<uint32_t>(sizeInt);
 }
 
-Archive::Archive(Buffer& b, bool& error) : data(b) {
+Archive::Archive(Buffer& b, bool& error) : data(b), symbolTable({nullptr, 0}), stringTable({nullptr, 0}) {
   error = false;
   if (data.size() < strlen(magic) ||
       memcmp(data.data(), magic, strlen(magic))) {
diff --git a/src/support/archive.h b/src/support/archive.h
index 40fea2529..95af1ac94 100644
--- a/src/support/archive.h
+++ b/src/support/archive.h
@@ -97,8 +97,8 @@ class Archive {
  private:
   void setFirstRegular(const Child& c) { firstRegularData = c.data; }
   Buffer& data;
-  SubBuffer symbolTable = {nullptr, 0};
-  SubBuffer stringTable = {nullptr, 0};
+  SubBuffer symbolTable;
+  SubBuffer stringTable;
   const uint8_t* firstRegularData;
 };
 
diff --git a/src/support/file.cpp b/src/support/file.cpp
index 59880e862..296fd6dbe 100644
--- a/src/support/file.cpp
+++ b/src/support/file.cpp
@@ -17,6 +17,7 @@
 #include "support/file.h"
 
 #include <cstdlib>
+#include <cstdint>
 #include <limits>
 
 template <typename T>