Skip to content

Commit d0ce2f0

Browse files
lemireDaniel Lemire
lemire
and
Daniel Lemire
authored
Fixing clang under visual studio (simdjson#1028)
* Lots of fixes * Removing some lambdas * Removing some functional programming. Co-authored-by: Daniel Lemire <lemire@gmai.com>
1 parent a19f635 commit d0ce2f0

File tree

13 files changed

+1168
-1503
lines changed

13 files changed

+1168
-1503
lines changed

‎.github/workflows/vs16-clang-ci.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: VS16-CLANG-CI
2+
3+
on: push
4+
5+
jobs:
6+
ci:
7+
name: windows-vs16
8+
runs-on: windows-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: 'Run CMake with VS16'
12+
uses: lukka/run-cmake@v2
13+
with:
14+
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
15+
cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
16+
buildDirectory: "${{ github.workspace }}/../../_temp/windows"
17+
cmakeBuildType: Release
18+
buildWithCMake: true
19+
cmakeGenerator: VS16Win64
20+
cmakeAppendedArgs: -T ClangCL -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_BUILD_STATIC=ON
21+
buildWithCMakeArgs: --config Release
22+
23+
- name: 'Run CTest'
24+
run: ctest -C Release -E checkperf --output-on-failure
25+
working-directory: "${{ github.workspace }}/../../_temp/windows"

‎benchmark/benchmark.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
event_count allocate_count = collector.end(); \
3131
aggregate << allocate_count; \
3232
} \
33-
uint64_t S = size; \
3433
if (collector.has_events()) { \
3534
printf("%7.3f", aggregate.best.cycles() / static_cast<double>(size)); \
3635
if (verbose) { \
@@ -76,7 +75,6 @@
7675
event_count allocate_count = collector.end(); \
7776
aggregate << allocate_count; \
7877
} \
79-
uint64_t S = size; \
8078
if (collector.has_events()) { \
8179
printf("%7.3f", aggregate.best.cycles() / static_cast<double>(size)); \
8280
if (verbose) { \

‎singleheader/amalgamate_demo.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on Wed Jul 1 14:00:57 EDT 2020. Do not edit! */
1+
/* auto-generated on Mon Jul 6 18:16:52 EDT 2020. Do not edit! */
22

33
#include <iostream>
44
#include "simdjson.h"

0 commit comments

Comments
 (0)