Skip to content

B
benchmark
Commit f30028b2 by Eric Fiselier
Options

Attempt to fix VC 2013 build.

VC 2013 injects valid when assigning an initializer list to std::set. This attempts to work around this issue by using std::set's constructors instead of the assignment operators.
parent dfe02607
Showing with 4 additions and 3 deletions
test/multiple_ranges_test.cc
...@@ -5,13 +5,14 @@ ...@@ -5,13 +5,14 @@
class MultipleRangesFixture : public ::benchmark::Fixture { class MultipleRangesFixture : public ::benchmark::Fixture {
public: public:
MultipleRangesFixture() { MultipleRangesFixture()
expectedValues = { : expectedValues({
{1, 3, 5}, {1, 3, 8}, {1, 3, 15}, {2, 3, 5}, {2, 3, 8}, {2, 3, 15}, {1, 3, 5}, {1, 3, 8}, {1, 3, 15}, {2, 3, 5}, {2, 3, 8}, {2, 3, 15},
{1, 4, 5}, {1, 4, 8}, {1, 4, 15}, {2, 4, 5}, {2, 4, 8}, {2, 4, 15}, {1, 4, 5}, {1, 4, 8}, {1, 4, 15}, {2, 4, 5}, {2, 4, 8}, {2, 4, 15},
{1, 7, 5}, {1, 7, 8}, {1, 7, 15}, {2, 7, 5}, {2, 7, 8}, {2, 7, 15}, {1, 7, 5}, {1, 7, 8}, {1, 7, 15}, {2, 7, 5}, {2, 7, 8}, {2, 7, 15},
{7, 6, 3} {7, 6, 3}
}; })
{
} }
void SetUp(const ::benchmark::State& state) { void SetUp(const ::benchmark::State& state) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment