CVS commit: pkgsrc/benchmarks/google-benchmark

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Mar 24 11:41:59 UTC 2017

Modified Files:
        pkgsrc/benchmarks/google-benchmark: Makefile distinfo
Added Files:
        pkgsrc/benchmarks/google-benchmark/patches:
            patch-include_benchmark_benchmark__api.h

Log Message:
Merge patch from upstream to always use std::string, the original
intention of optional inclusion no longer applies anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/benchmarks/google-benchmark/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/benchmarks/google-benchmark/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/benchmarks/google-benchmark/patches/patch-include_benchmark_benchmark__api.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/benchmarks/google-benchmark/Makefile
diff -u pkgsrc/benchmarks/google-benchmark/Makefile:1.1 pkgsrc/benchmarks/google-benchmark/Makefile:1.2
--- pkgsrc/benchmarks/google-benchmark/Makefile:1.1     Mon Nov 21 18:20:30 2016
+++ pkgsrc/benchmarks/google-benchmark/Makefile Fri Mar 24 11:41:58 2017
@@ -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

Index: pkgsrc/benchmarks/google-benchmark/distinfo
diff -u pkgsrc/benchmarks/google-benchmark/distinfo:1.2 pkgsrc/benchmarks/google-benchmark/distinfo:1.3
--- pkgsrc/benchmarks/google-benchmark/distinfo:1.2     Tue Feb  7 23:54:08 2017
+++ pkgsrc/benchmarks/google-benchmark/distinfo Fri Mar 24 11:41:58 2017
@@ -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

Added files:

Index: pkgsrc/benchmarks/google-benchmark/patches/patch-include_benchmark_benchmark__api.h
diff -u /dev/null pkgsrc/benchmarks/google-benchmark/patches/patch-include_benchmark_benchmark__api.h:1.1
--- /dev/null   Fri Mar 24 11:41:59 2017
+++ pkgsrc/benchmarks/google-benchmark/patches/patch-include_benchmark_benchmark__api.h Fri Mar 24 11:41:59 2017
@@ -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());
+   }
+