Skip to content

Commit 52d9997

Browse files
author
John Farrier
committed
Merge branch 'release/v2.0.3'
2 parents 4cbc841 + 7585e7e commit 52d9997

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+97
-68
lines changed

‎CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Top level makefile for Celero
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -29,7 +29,9 @@ PROJECT(CeleroProject)
2929
include(CheckFunctionExists)
3030
include(CheckCXXSourceCompiles)
3131
include(CheckIncludeFile)
32-
cmake_policy(SET CMP0042 OLD) # MACOSX_RPATH migration
32+
if(POLICY CMP0042)
33+
cmake_policy(SET CMP0042 OLD) # MACOSX_RPATH migration
34+
endif()
3335

3436

3537
#

‎experiments/DemoDoNotOptimizeAway/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎experiments/DemoFileWrite/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎experiments/DemoMultithread/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎experiments/DemoSimple/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎experiments/DemoSimpleJUnit/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎experiments/DemoSleep/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎experiments/DemoToString/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎experiments/DemoToString/DemoToString.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,15 @@ BENCHMARK(DemoToString, table, 128, 1000000)
118118
celero::DoNotOptimizeAway(uint8str[x]);
119119
}
120120

121+
#ifdef _itoa // Not supported for all compilers
121122
BENCHMARK(DemoToString, itoa, 128, 1000000)
122123
{
123124
const uint8_t x = rand() % 42;
124125
char buffer[64];
125126
_itoa(x, buffer, 10);
126127
celero::DoNotOptimizeAway(std::string(buffer));
127128
}
129+
#endif
128130

129131
/// http://ideone.com/GkPcy
130132
BENCHMARK(DemoToString, hopmanFast, 128, 1000000)

‎experiments/DemoTransform/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎experiments/ExperimentCostOfPimpl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎experiments/ExperimentParameterPassing/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎experiments/ExperimentSimpleComparison/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎experiments/ExperimentSortingRandomInts/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015 John Farrier
4+
# Copyright 2016 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎include/celero/Archive.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/Benchmark.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/Callbacks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
///
77
/// \author John Farrier
88
///
9-
/// \copyright Copyright 2015 John Farrier
9+
/// \copyright Copyright 2016 John Farrier
1010
///
1111
/// Licensed under the Apache License, Version 2.0 (the "License");
1212
/// you may not use this file except in compliance with the License.

‎include/celero/Celero.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
///
77
/// \author John Farrier
88
///
9-
/// \copyright Copyright 2015 John Farrier
9+
/// \copyright Copyright 2016 John Farrier
1010
///
1111
/// Licensed under the Apache License, Version 2.0 (the "License");
1212
/// you may not use this file except in compliance with the License.

‎include/celero/Console.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/Distribution.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/Executor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/Experiment.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/Export.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/Factory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/FileReader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/GenericFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/JUnit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/Pimpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/PimplImpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/Print.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/Result.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/ResultTable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.

‎include/celero/Statistics.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
/// \author John Farrier
66
///
7-
/// \copyright Copyright 2015 John Farrier
7+
/// \copyright Copyright 2016 John Farrier
88
///
99
/// Licensed under the Apache License, Version 2.0 (the "License");
1010
/// you may not use this file except in compliance with the License.
@@ -22,6 +22,8 @@
2222
#include <celero/Export.h>
2323
#include <celero/Pimpl.h>
2424

25+
#include <cstdint>
26+
2527
namespace celero
2628
{
2729
///

0 commit comments

Comments
 (0)