Skip to content

Commit 4c1fd97

Browse files
authored
Merge pull request #23 from saxbophone/new-compilers
Use newer XCode and MSVC
2 parents b742b94 + 6ef292c commit 4c1fd97

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,17 @@ matrix:
3939
- MATRIX_EVAL="CMAKE_GENERATOR='Unix Makefiles' && CXX=clang++-10"
4040
- name: Clang 10 on macOS
4141
os: osx
42-
osx_image: xcode10.3 # this image has CLang 10.0.1 (same as Linux) and CMake 3.15
42+
osx_image: xcode12.2 # this image has Clang >10.0.1 and CMake >3.15
4343
env:
4444
- MATRIX_EVAL="CMAKE_GENERATOR='Unix Makefiles' && CXX=clang++"
45-
- name: MSVC 2017 on Windows
45+
- name: MSVC 2019 on Windows
4646
os: windows
4747
env:
48-
- MATRIX_EVAL="CMAKE_GENERATOR='Visual Studio 15 2017'"
48+
- MATRIX_EVAL="CMAKE_GENERATOR='Visual Studio 16 2019'"
4949
before_install:
5050
- eval "${MATRIX_EVAL}"
51+
install:
52+
- if [ $TRAVIS_OS_NAME = 'windows' ]; then choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64"; fi
5153
before_script:
5254
- cd build
5355
- cmake -G "$CMAKE_GENERATOR" ..

dengr/eight_to_fourteen.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222

2323
#include <cstddef>
2424

25-
// MSVC doesn't support the alternative operators out of the box
26-
#ifdef _MSC_VER
27-
#include <iso646.h>
28-
#endif
2925

3026
#include "Byte.hpp"
3127
#include "ChannelByte.hpp"

0 commit comments

Comments
 (0)