From f22859f1c5ed482a82be8e15ac0e79f230a79536 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Fri, 24 Mar 2017 11:41:58 +0000
Subject: Merge patch from upstream to always use std::string, the original
 intention of optional inclusion no longer applies anyway.

---
 benchmarks/google-benchmark/Makefile               |  3 +-
 benchmarks/google-benchmark/distinfo               |  3 +-
 .../patch-include_benchmark_benchmark__api.h       | 32 ++++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 benchmarks/google-benchmark/patches/patch-include_benchmark_benchmark__api.h

(limited to 'benchmarks')

diff --git a/benchmarks/google-benchmark/Makefile b/benchmarks/google-benchmark/Makefile
index 02e638cd386..7e29e199f3d 100644
--- a/benchmarks/google-benchmark/Makefile
+++ b/benchmarks/google-benchmark/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2016/11/21 18:20:30 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/03/24 11:41:58 joerg Exp $
 
 DISTNAME=	benchmark-1.1.0
 PKGNAME=	google-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	${MASTER_SITE_GITHUB:=google/}
 GITHUB_PROJECT=	benchmark
diff --git a/benchmarks/google-benchmark/distinfo b/benchmarks/google-benchmark/distinfo
index bb696a1f781..d56c69cf18c 100644
--- a/benchmarks/google-benchmark/distinfo
+++ b/benchmarks/google-benchmark/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2017/02/07 23:54:08 joerg Exp $
+$NetBSD: distinfo,v 1.3 2017/03/24 11:41:58 joerg Exp $
 
 SHA1 (benchmark-1.1.0.tar.gz) = 8c539bbe2a212618fa87b6c38fba087100b6e4ae
 RMD160 (benchmark-1.1.0.tar.gz) = 7e7f2d687ef515a846c04933545f7c63752d2de5
 SHA512 (benchmark-1.1.0.tar.gz) = 533061531e6a37723a626addc9e779018c4c2cfc8634ae45860eec0d3800103b5b562f865ac1dc0c8dbe045579b81e59de887e1c48318cebf160f03c18321831
 Size (benchmark-1.1.0.tar.gz) = 87199 bytes
 SHA1 (patch-CMakeLists.txt) = b76675097fde2b85fc3c7e9601666007654c1d0c
+SHA1 (patch-include_benchmark_benchmark__api.h) = 1fa32704d75d2f23fbc3fc9aa0d9b44e12b4c82b
diff --git a/benchmarks/google-benchmark/patches/patch-include_benchmark_benchmark__api.h b/benchmarks/google-benchmark/patches/patch-include_benchmark_benchmark__api.h
new file mode 100644
index 00000000000..901c262ceda
--- /dev/null
+++ b/benchmarks/google-benchmark/patches/patch-include_benchmark_benchmark__api.h
@@ -0,0 +1,32 @@
+$NetBSD: patch-include_benchmark_benchmark__api.h,v 1.1 2017/03/24 11:41:59 joerg Exp $
+
+8ae6448cc7ec6353e3491a2a15f972f9735f124b
+
+--- include/benchmark/benchmark_api.h.orig	2017-03-23 20:34:16.066191652 +0000
++++ include/benchmark/benchmark_api.h
+@@ -202,14 +202,6 @@ struct Voider {
+   typedef void type;
+ };
+ 
+-template <class T, class = void>
+-struct EnableIfString {};
+-
+-template <class T>
+-struct EnableIfString<T, typename Voider<typename T::basic_string>::type> {
+-  typedef int type;
+-};
+-
+ void UseCharPointer(char const volatile*);
+ 
+ // Take ownership of the pointer and register the benchmark. Return the
+@@ -397,9 +389,7 @@ class State {
+   // This function does not participate in overload resolution unless StringType
+   // has the nested typename `basic_string`. This typename should be provided
+   // as an injected class name in the case of std::string.
+-  template <class StringType>
+-  void SetLabel(StringType const& str,
+-                typename internal::EnableIfString<StringType>::type = 1) {
++  void BENCHMARK_ALWAYS_INLINE SetLabel(const std::string& str) {
+     this->SetLabel(str.c_str());
+   }
+ 
-- 
cgit v1.2.3