From cc1da90873c81fe79db4426c7390ff0d2d9d434c Mon Sep 17 00:00:00 2001
From: Thomas Fussell <thomas.fussell@gmail.com>
Date: Wed, 13 Aug 2014 18:58:11 -0400
Subject: [PATCH] merge changes

---
 include/xlnt/cell/value.hpp |  1 +
 source/value.cpp            |  2 ++
 source/zip_file.cpp         |  1 +
 tests/runner-autogen.cpp    | 26 +++++++++++++-------------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/include/xlnt/cell/value.hpp b/include/xlnt/cell/value.hpp
index d80579b4..0a6b6010 100644
--- a/include/xlnt/cell/value.hpp
+++ b/include/xlnt/cell/value.hpp
@@ -37,6 +37,7 @@ public:
     value(uint16_t i);
     value(uint32_t i);
     value(uint64_t i);
+    value(long long int i);
     value(float f);
     value(double d);
     value(long double d);
diff --git a/source/value.cpp b/source/value.cpp
index 6acafc30..06032d5f 100644
--- a/source/value.cpp
+++ b/source/value.cpp
@@ -1,3 +1,5 @@
+#include <stdexcept>
+
 #include <xlnt/cell/value.hpp>
 #include <xlnt/common/datetime.hpp>
 
diff --git a/source/zip_file.cpp b/source/zip_file.cpp
index 96043181..64cd7bcd 100644
--- a/source/zip_file.cpp
+++ b/source/zip_file.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <cstring>
 #include <fstream>
 
 #ifdef _WIN32
diff --git a/tests/runner-autogen.cpp b/tests/runner-autogen.cpp
index db7503e9..d6cefb18 100644
--- a/tests/runner-autogen.cpp
+++ b/tests/runner-autogen.cpp
@@ -21,7 +21,7 @@ int main( int argc, char *argv[] ) {
     return status;
 }
 bool suite_test_cell_init = false;
-#include "C:\Users\taf656\Development\xlnt\tests\test_cell.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_cell.hpp"
 
 static test_cell suite_test_cell;
 
@@ -256,7 +256,7 @@ public:
  void runTest() { suite_test_cell.test_cell_offset(); }
 } testDescription_suite_test_cell_test_cell_offset;
 
-#include "C:\Users\taf656\Development\xlnt\tests\test_chart.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_chart.hpp"
 
 static test_chart suite_test_chart;
 
@@ -347,7 +347,7 @@ public:
  void runTest() { suite_test_chart.test_write_chart_scatter(); }
 } testDescription_suite_test_chart_test_write_chart_scatter;
 
-#include "C:\Users\taf656\Development\xlnt\tests\test_named_range.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_named_range.hpp"
 
 static test_named_range suite_test_named_range;
 
@@ -438,7 +438,7 @@ public:
  void runTest() { suite_test_named_range.test_can_be_saved(); }
 } testDescription_suite_test_named_range_test_can_be_saved;
 
-#include "C:\Users\taf656\Development\xlnt\tests\test_number_format.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_number_format.hpp"
 
 static test_number_format suite_test_number_format;
 
@@ -541,7 +541,7 @@ public:
  void runTest() { suite_test_number_format.test_mac_date(); }
 } testDescription_suite_test_number_format_test_mac_date;
 
-#include "C:\Users\taf656\Development\xlnt\tests\test_props.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_props.hpp"
 
 static test_props suite_test_props;
 
@@ -584,7 +584,7 @@ public:
  void runTest() { suite_test_props.test_write_properties_app(); }
 } testDescription_suite_test_props_test_write_properties_app;
 
-#include "C:\Users\taf656\Development\xlnt\tests\test_read.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_read.hpp"
 
 static test_read suite_test_read;
 
@@ -777,7 +777,7 @@ public:
  void runTest() { suite_test_read.test_bad_formats_no(); }
 } testDescription_suite_test_read_test_bad_formats_no;
 
-#include "C:\Users\taf656\Development\xlnt\tests\test_strings.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_strings.hpp"
 
 static test_strings suite_test_strings;
 
@@ -808,7 +808,7 @@ public:
  void runTest() { suite_test_strings.test_formatted_string_table(); }
 } testDescription_suite_test_strings_test_formatted_string_table;
 
-#include "C:\Users\taf656\Development\xlnt\tests\test_style.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_style.hpp"
 
 static test_style suite_test_style;
 
@@ -917,7 +917,7 @@ public:
  void runTest() { suite_test_style.test_protection(); }
 } testDescription_suite_test_style_test_protection;
 
-#include "C:\Users\taf656\Development\xlnt\tests\test_theme.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_theme.hpp"
 
 static test_theme suite_test_theme;
 
@@ -930,7 +930,7 @@ public:
  void runTest() { suite_test_theme.test_write_theme(); }
 } testDescription_suite_test_theme_test_write_theme;
 
-#include "C:\Users\taf656\Development\xlnt\tests\test_workbook.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_workbook.hpp"
 
 static test_workbook suite_test_workbook;
 
@@ -1051,7 +1051,7 @@ public:
  void runTest() { suite_test_workbook.test_write_regular_float(); }
 } testDescription_suite_test_workbook_test_write_regular_float;
 
-#include "C:\Users\taf656\Development\xlnt\tests\test_worksheet.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_worksheet.hpp"
 
 static test_worksheet suite_test_worksheet;
 
@@ -1292,7 +1292,7 @@ public:
  void runTest() { suite_test_worksheet.test_page_options(); }
 } testDescription_suite_test_worksheet_test_page_options;
 
-#include "C:\Users\taf656\Development\xlnt\tests\test_write.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_write.hpp"
 
 static test_write suite_test_write;
 
@@ -1431,7 +1431,7 @@ public:
  void runTest() { suite_test_write.test_short_number(); }
 } testDescription_suite_test_write_test_short_number;
 
-#include "C:\Users\taf656\Development\xlnt\tests\test_zip_file.hpp"
+#include "/n/home08/tfussell/build/xlnt/tests/test_zip_file.hpp"
 
 static test_zip_file suite_test_zip_file;