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: mockingbirdnest/benchmark
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 47d58c4b3987
Choose a base ref
...
head repository: mockingbirdnest/benchmark
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 20791527a91b
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Nov 30, 2019

  1. vectorcall

    eggrobin committed Nov 30, 2019
    Copy the full SHA
    2079152 View commit details
Showing with 6 additions and 2 deletions.
  1. +2 −0 msvc/google-benchmark-test.vcxproj
  2. +2 −0 msvc/google-benchmark.vcxproj
  3. +1 −1 src/check.h
  4. +1 −1 src/log.h
2 changes: 2 additions & 0 deletions msvc/google-benchmark-test.vcxproj
Original file line number Diff line number Diff line change
@@ -63,6 +63,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<CallingConvention>VectorCall</CallingConvention>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -82,6 +83,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<WholeProgramOptimization>false</WholeProgramOptimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<CallingConvention>VectorCall</CallingConvention>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
2 changes: 2 additions & 0 deletions msvc/google-benchmark.vcxproj
Original file line number Diff line number Diff line change
@@ -106,6 +106,7 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<CallingConvention>VectorCall</CallingConvention>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -126,6 +127,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<WholeProgramOptimization>false</WholeProgramOptimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<CallingConvention>VectorCall</CallingConvention>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
2 changes: 1 addition & 1 deletion src/check.h
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
namespace benchmark {
namespace internal {

typedef void(AbortHandlerT)();
typedef void(__cdecl AbortHandlerT)();

inline AbortHandlerT*& GetAbortHandler() {
static AbortHandlerT* handler = &std::abort;
2 changes: 1 addition & 1 deletion src/log.h
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
namespace benchmark {
namespace internal {

typedef std::basic_ostream<char>&(EndLType)(std::basic_ostream<char>&);
typedef std::basic_ostream<char>&(__cdecl EndLType)(std::basic_ostream<char>&);

class LogType {
friend LogType& GetNullLogInstance();