record new upstream branch and merge it

11 files changed, 56 insertions, 56 deletions

diff --git a/.travis.yml b/.travis.yml
index 80ee625..730b1ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,7 @@ addons:
       - llvm-toolchain-trusty-3.9
       - llvm-toolchain-trusty-4.0
       - llvm-toolchain-trusty-5.0
+      - llvm-toolchain-trusty-6.0
 
 compiler: clang
 os: linux
@@ -72,14 +73,6 @@ matrix:
           packages: ["g++-4.4", "valgrind", "g++-4.4-multilib", "libc6-dbg", "libc6-dbg:i386"]
           sources: *apt_sources
 
-    # GCC 4.5
-    - env: COMPILER=g++-4.5
-      compiler: gcc
-      addons: &gcc45
-        apt:
-          packages: ["g++-4.5", "valgrind", "g++-4.5-multilib", "libc6-dbg", "libc6-dbg:i386"]
-          sources: *apt_sources
-
     # GCC 4.6
     - env: COMPILER=g++-4.6
       compiler: gcc
@@ -185,6 +178,13 @@ matrix:
           packages: ["clang-5.0", "valgrind", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"]
           sources: *apt_sources
 
+    # Clang 6.0
+    - env: COMPILER=clang++-6.0 HAS_ASAN_32=true HAS_UBSAN_32=true HAS_ASAN_64=true HAS_UBSAN_64=true
+      addons: &clang60
+        apt:
+          packages: ["clang-6.0", "valgrind", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"]
+          sources: *apt_sources
+
     # Xcode 6.4 Clang
     - env: COMPILER=clang++
       osx_image: xcode6.4
@@ -220,24 +220,6 @@ matrix:
       osx_image: xcode9.2
       os: osx
 
-    # OSX GCC 4.6
-    - env: COMPILER=g++-4.6
-      compiler: gcc
-      osx_image: xcode6.4
-      os: osx
-
-    # OSX GCC 4.7
-    - env: COMPILER=g++-4.7
-      compiler: gcc
-      osx_image: xcode6.4
-      os: osx
-
-    # OSX GCC 4.8
-    - env: COMPILER=g++-4.8 HAS_ASAN_32=true HAS_ASAN_64=true
-      compiler: gcc
-      osx_image: xcode6.4
-      os: osx
-
     # OSX GCC 4.9
     - env: COMPILER=g++-4.9 HAS_UBSAN_32=true HAS_ASAN_64=true HAS_UBSAN_64=true # no ASAN_32 - errors when using ASAN_OPTIONS - probably g++ 4.9 bug
       compiler: gcc
@@ -269,8 +251,8 @@ matrix:
 
   allow_failures:
 
-    # GCC 4.5
-    - env: COMPILER=g++-4.5
+    # GCC 7
+    - env: COMPILER=g++-7 HAS_ASAN_32=true HAS_UBSAN_32=true HAS_ASAN_64=true HAS_UBSAN_64=true ADDITIONAL_CXX_FLAGS=" -fuse-ld=gold"
       compiler: gcc
 
     # Clang 3.7
@@ -279,11 +261,14 @@ matrix:
     # Clang 3.9
     - env: COMPILER=clang++-3.9 HAS_ASAN_64=true HAS_UBSAN_64=true
 
-    # OSX GCC 4.8
-    - env: COMPILER=g++-4.8 HAS_ASAN_32=true HAS_ASAN_64=true
-      compiler: gcc
-      osx_image: xcode6.4
-      os: osx
+    # Clang 4.0
+    - env: COMPILER=clang++-4.0 HAS_ASAN_32=true HAS_UBSAN_32=true HAS_ASAN_64=true HAS_UBSAN_64=true
+
+    # Clang 5.0
+    - env: COMPILER=clang++-5.0 HAS_ASAN_32=true HAS_UBSAN_32=true HAS_ASAN_64=true HAS_UBSAN_64=true
+
+    # Clang 6.0
+    - env: COMPILER=clang++-6.0 HAS_ASAN_32=true HAS_UBSAN_32=true HAS_ASAN_64=true HAS_UBSAN_64=true
 
     # OSX GCC 6
     - env: COMPILER=g++-6 HAS_ASAN_32=true HAS_UBSAN_32=true HAS_ASAN_64=true HAS_UBSAN_64=true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9cbd0c..00e38c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## [1.2.8](https://github.com/onqtam/doctest/tree/1.2.8) (2018-03-10)
+[Full Changelog](https://github.com/onqtam/doctest/compare/1.2.7...1.2.8)
+
+**Closed issues:**
+
+- ARM64 builds: templated\_test\_cases.cpp test fails [\#119](https://github.com/onqtam/doctest/issues/119)
+- ARM builds: FTBFS on armhf - error: cast from 'const char\*' to 'const  [\#118](https://github.com/onqtam/doctest/issues/118)
+
 ## [1.2.7](https://github.com/onqtam/doctest/tree/1.2.7) (2018-02-06)
 [Full Changelog](https://github.com/onqtam/doctest/compare/1.2.6...1.2.7)
 
diff --git a/LICENSE.txt b/LICENSE.txt
index 788b351..62cdd94 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2017 Viktor Kirilov
+Copyright (c) 2016-2018 Viktor Kirilov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index ae8d785..0b1f29c 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ The framework can be used like any other if you don't want/need to mix productio
 [![download](https://img.shields.io/badge/download%20%20-latest-blue.svg)](https://raw.githubusercontent.com/onqtam/doctest/master/doctest/doctest.h)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/503/badge)](https://bestpractices.coreinfrastructure.org/projects/503)
 [![Join the chat at https://gitter.im/onqtam/doctest](https://badges.gitter.im/onqtam/doctest.svg)](https://gitter.im/onqtam/doctest?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Try it online](https://img.shields.io/badge/try%20it-online-orange.svg)](https://wandbox.org/permlink/YSid52GI4qMDFvs1)
+[![Try it online](https://img.shields.io/badge/try%20it-online-orange.svg)](https://wandbox.org/permlink/cuvJ2XfsChtgIYyk)
 <!--
 [![Language](https://img.shields.io/badge/language-C++-blue.svg)](https://isocpp.org/)
 [![documentation](https://img.shields.io/badge/documentation%20%20-online-blue.svg)](https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md#reference)
@@ -146,6 +146,7 @@ Want to see your name or the name of your company here? Consider donating!
 
 ### :cake: Silver sponsors :cake:
 
+- Aras Pranckevicius
 - Dan Nissenbaum
 
 ### :hamburger: Bronze sponsors :hamburger:
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 60d1a86..f91ca29 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
 # see git-dpm(1) from git-dpm package
-57a747186b7ebf156b362f6ecb81e1cfca45d4cf
-57a747186b7ebf156b362f6ecb81e1cfca45d4cf
-57a747186b7ebf156b362f6ecb81e1cfca45d4cf
-57a747186b7ebf156b362f6ecb81e1cfca45d4cf
-doctest_1.2.7+repack0.orig.tar.xz
-18f5195ed0c03467b02e79388bafe4840a13a5e9
-2084144
+28bd54dba3c6592731bd9bdf561e3bcd4333cf0a
+28bd54dba3c6592731bd9bdf561e3bcd4333cf0a
+28bd54dba3c6592731bd9bdf561e3bcd4333cf0a
+28bd54dba3c6592731bd9bdf561e3bcd4333cf0a
+doctest_1.2.8+repack0.orig.tar.xz
+acabc53276409d18f0c02662c46e86b5467a698e
+2084456
diff --git a/doctest/doctest.h b/doctest/doctest.h
index 9373570..e0d8024 100644
--- a/doctest/doctest.h
+++ b/doctest/doctest.h
@@ -4,7 +4,7 @@
 //
 // doctest.h - the lightest feature-rich C++ single-header testing framework for unit tests and TDD
 //
-// Copyright (c) 2016-2017 Viktor Kirilov
+// Copyright (c) 2016-2018 Viktor Kirilov
 //
 // Distributed under the MIT Software License
 // See accompanying file LICENSE.txt or copy at
@@ -53,8 +53,8 @@
 
 #define DOCTEST_VERSION_MAJOR 1
 #define DOCTEST_VERSION_MINOR 2
-#define DOCTEST_VERSION_PATCH 7
-#define DOCTEST_VERSION_STR "1.2.7"
+#define DOCTEST_VERSION_PATCH 8
+#define DOCTEST_VERSION_STR "1.2.8"
 
 #define DOCTEST_VERSION                                                                            \
     (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)
@@ -462,9 +462,11 @@ DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat-pedantic")
 #if DOCTEST_MSVC
 #define DOCTEST_NOINLINE __declspec(noinline)
 #define DOCTEST_UNUSED
+#define DOCTEST_ALIGNMENT(x)
 #else // MSVC
 #define DOCTEST_NOINLINE __attribute__((noinline))
 #define DOCTEST_UNUSED __attribute__((unused))
+#define DOCTEST_ALIGNMENT(x) __attribute__((aligned(x)))
 #endif // MSVC
 
 #ifndef DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK
@@ -1864,7 +1866,8 @@ namespace detail
 
         struct Chunk
         {
-            char buf[sizeof(Capture<char>)]; // place to construct a Capture<T>
+            char buf[sizeof(Capture<char>)] DOCTEST_ALIGNMENT(
+                    2 * sizeof(void*)); // place to construct a Capture<T>
         };
 
         struct Node
diff --git a/doctest/parts/doctest_fwd.h b/doctest/parts/doctest_fwd.h
index 4f6c1c7..765641c 100644
--- a/doctest/parts/doctest_fwd.h
+++ b/doctest/parts/doctest_fwd.h
@@ -1,7 +1,7 @@
 //
 // doctest.h - the lightest feature-rich C++ single-header testing framework for unit tests and TDD
 //
-// Copyright (c) 2016-2017 Viktor Kirilov
+// Copyright (c) 2016-2018 Viktor Kirilov
 //
 // Distributed under the MIT Software License
 // See accompanying file LICENSE.txt or copy at
@@ -50,8 +50,8 @@
 
 #define DOCTEST_VERSION_MAJOR 1
 #define DOCTEST_VERSION_MINOR 2
-#define DOCTEST_VERSION_PATCH 7
-#define DOCTEST_VERSION_STR "1.2.7"
+#define DOCTEST_VERSION_PATCH 8
+#define DOCTEST_VERSION_STR "1.2.8"
 
 #define DOCTEST_VERSION                                                                            \
     (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)
@@ -459,9 +459,11 @@ DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat-pedantic")
 #if DOCTEST_MSVC
 #define DOCTEST_NOINLINE __declspec(noinline)
 #define DOCTEST_UNUSED
+#define DOCTEST_ALIGNMENT(x)
 #else // MSVC
 #define DOCTEST_NOINLINE __attribute__((noinline))
 #define DOCTEST_UNUSED __attribute__((unused))
+#define DOCTEST_ALIGNMENT(x) __attribute__((aligned(x)))
 #endif // MSVC
 
 #ifndef DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK
@@ -1861,7 +1863,8 @@ namespace detail
 
         struct Chunk
         {
-            char buf[sizeof(Capture<char>)]; // place to construct a Capture<T>
+            char buf[sizeof(Capture<char>)] DOCTEST_ALIGNMENT(
+                    2 * sizeof(void*)); // place to construct a Capture<T>
         };
 
         struct Node
diff --git a/examples/all_features/templated_test_cases.cpp b/examples/all_features/templated_test_cases.cpp
index 5bef14e..05baa75 100644
--- a/examples/all_features/templated_test_cases.cpp
+++ b/examples/all_features/templated_test_cases.cpp
@@ -5,7 +5,7 @@ DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
 DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END
 
 // typedefs are required if variadic macro support is not available (otherwise the commas are a problem)
-typedef doctest::Types<char, short, int> int_types;
+typedef doctest::Types<signed char, short, int> int_types;
 typedef doctest::Types<double, double> float_types; // note that types won't be filtered for uniqueness
 
 // =================================================================================================
@@ -23,7 +23,7 @@ TYPE_TO_STRING(std::vector<int>);
 
 TEST_CASE_TEMPLATE("vector stuff", T, doctest::Types<std::vector<int> >) {
     T vec(10);
-    CHECK(vec.size() == 20); // fill fail
+    CHECK(vec.size() == 20); // will fail
 }
 
 // =================================================================================================
diff --git a/examples/all_features/test_output/version.txt b/examples/all_features/test_output/version.txt
index 5b3bcd3..a8cbe8a 100644
--- a/examples/all_features/test_output/version.txt
+++ b/examples/all_features/test_output/version.txt
@@ -1 +1 @@
-[doctest] doctest version is "1.2.7"
+[doctest] doctest version is "1.2.8"
diff --git a/scripts/send_to_wandbox.py b/scripts/send_to_wandbox.py
index 07fb525..2b480cc 100644
--- a/scripts/send_to_wandbox.py
+++ b/scripts/send_to_wandbox.py
@@ -119,10 +119,10 @@ def main():
     })
 
     if 'status' in response and not 'compiler_error' in response: # and response['status'] == '0':
-        print response['url']
+        print(response['url'])
         return 0
     else:
-        print response
+        print(response)
         return 1
 
 
diff --git a/scripts/version.txt b/scripts/version.txt
index a77d7d9..5975b14 100644
--- a/scripts/version.txt
+++ b/scripts/version.txt
@@ -1 +1 @@
-1.2.7
\ No newline at end of file
+1.2.8
\ No newline at end of file