boost/leaf
2
0
Fork 0
mirror of https://github.com/boostorg/leaf.git synced 2026-01-19 04:22:08 +00:00
Code Issues Projects Releases Wiki Activity

Minor msvc fixes

Browse Source
This commit is contained in:
unknown
2020-07-18 17:22:29 -07:00
parent 1fdd8654fe
commit 6eaab3124c
6 changed files with 17 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -12,4 +12,5 @@ snippets/*
subprojects/*/
.vscode/ipch/*
.vscode/settings.json
.vscode/c_cpp_properties.json
benchmark/tl/*

37
.vscode/c_cpp_properties.json vendored
View File

@@ -1,37 +0,0 @@
{
"configurations": [
{
"name": "Mac",
"includePath": [
"${workspaceFolder}/**"
],
"defines": [],
"macFrameworkPath": [
"/System/Library/Frameworks",
"/Library/Frameworks"
],
"compilerPath": "/usr/bin/clang",
"cStandard": "c11",
"cppStandard": "c++17",
"intelliSenseMode": "clang-x64",
"compileCommands": "${workspaceFolder}/bld/debug/compile_commands.json"
},
{
"name": "Win32",
"includePath": [
"${workspaceFolder}/**"
],
"defines": [
"_DEBUG",
"UNICODE",
"_UNICODE"
],
"windowsSdkVersion": "10.0.19041.0",
"compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.26.28801/bin/Hostx64/x64/cl.exe",
"cStandard": "c11",
"cppStandard": "c++17",
"compileCommands": "${workspaceFolder}/bld/debug/compile_commands.json"
}
],
"version": 4
}

2
.vscode/msvc.bat vendored
View File

@@ -1,2 +1,2 @@
"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
exit /B 0

14
include/boost/leaf/all.hpp
View File

@@ -547,14 +547,14 @@ namespace boost { namespace leaf {
// Configure BOOST_LEAF_NO_EXCEPTIONS, unless already #defined
#ifndef BOOST_LEAF_NO_EXCEPTIONS
# if defined __clang__ && !defined(__ibmxl__)
# if defined(__clang__) && !defined(__ibmxl__)
// Clang C++ emulates GCC, so it has to appear early.
# if !__has_feature(cxx_exceptions)
# define BOOST_LEAF_NO_EXCEPTIONS
# endif
# elif defined __DMC__
# elif defined(__DMC__)
// Digital Mars C++
# if !defined(_CPPUNWIND)
@@ -568,28 +568,28 @@ namespace boost { namespace leaf {
# define BOOST_LEAF_NO_EXCEPTIONS
# endif
# elif defined __KCC
# elif defined(__KCC)
// Kai C++
# if !defined(_EXCEPTIONS)
# define BOOST_LEAF_NO_EXCEPTIONS
# endif
# elif defined __CODEGEARC__
# elif defined(__CODEGEARC__)
// CodeGear - must be checked for before Borland
# if !defined(_CPPUNWIND) && !defined(__EXCEPTIONS)
# define BOOST_LEAF_NO_EXCEPTIONS
# endif
# elif defined __BORLANDC__
# elif defined(__BORLANDC__)
// Borland
# if !defined(_CPPUNWIND) && !defined(__EXCEPTIONS)
# define BOOST_LEAF_NO_EXCEPTIONS
# endif
# elif defined __MWERKS__
# elif defined(__MWERKS__)
// Metrowerks CodeWarrior
# if !__option(exceptions)
@@ -610,7 +610,7 @@ namespace boost { namespace leaf {
# define BOOST_LEAF_NO_EXCEPTIONS
# endif
# elif defined _MSC_VER
# elif defined(_MSC_VER)
// Microsoft Visual C++
//
// Must remain the last #elif since some other vendors (Metrowerks, for

14
include/boost/leaf/config.hpp
View File

@@ -27,14 +27,14 @@
// Configure BOOST_LEAF_NO_EXCEPTIONS, unless already #defined
#ifndef BOOST_LEAF_NO_EXCEPTIONS
# if defined __clang__ && !defined(__ibmxl__)
# if defined(__clang__) && !defined(__ibmxl__)
// Clang C++ emulates GCC, so it has to appear early.
# if !__has_feature(cxx_exceptions)
# define BOOST_LEAF_NO_EXCEPTIONS
# endif
# elif defined __DMC__
# elif defined(__DMC__)
// Digital Mars C++
# if !defined(_CPPUNWIND)
@@ -48,28 +48,28 @@
# define BOOST_LEAF_NO_EXCEPTIONS
# endif
# elif defined __KCC
# elif defined(__KCC)
// Kai C++
# if !defined(_EXCEPTIONS)
# define BOOST_LEAF_NO_EXCEPTIONS
# endif
# elif defined __CODEGEARC__
# elif defined(__CODEGEARC__)
// CodeGear - must be checked for before Borland
# if !defined(_CPPUNWIND) && !defined(__EXCEPTIONS)
# define BOOST_LEAF_NO_EXCEPTIONS
# endif
# elif defined __BORLANDC__
# elif defined(__BORLANDC__)
// Borland
# if !defined(_CPPUNWIND) && !defined(__EXCEPTIONS)
# define BOOST_LEAF_NO_EXCEPTIONS
# endif
# elif defined __MWERKS__
# elif defined(__MWERKS__)
// Metrowerks CodeWarrior
# if !__option(exceptions)
@@ -90,7 +90,7 @@
# define BOOST_LEAF_NO_EXCEPTIONS
# endif
# elif defined _MSC_VER
# elif defined(_MSC_VER)
// Microsoft Visual C++
//
// Must remain the last #elif since some other vendors (Metrowerks, for

2
meson.build
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2018-2019 Emil Dotchevski and Reverge Studios, Inc.
# Copyright (c) 2018-2020 Emil Dotchevski and Reverge Studios, Inc.
# Distributed under the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)