Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: google/benchmark
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: Formlabs/benchmark
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: formlabs
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 1, 2018

  1. Fix std::string detection hack for SetLabel. 

    Previously benchmark_api.h wasn't allowed to include standard library
headers. For this reason SetLabel had a hack to accept std::string
without including <string>. The hack worked by attempting to detect
the injected class name `basic_string`. However Clang has changed
it's behavior regarding injected class names so this hack no longer
works.

This patch removes the hack and replaces it with a function that
actually names std::string. However we still cannot pass std::string
across the dylib boundary because of libstdc++'s dual C++11 ABI.
    @EricWF @mgarrity
    EricWF authored and mgarrity committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    fe62acb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from mgarrity/clang-fix 

    Fix std::string detection hack for SetLabel.
    @mgarrity
    mgarrity authored Jun 1, 2018
    Configuration menu
    Copy the full SHA
    f48cf31 View commit details
    Browse the repository at this point in the history
Loading