Skip to content

Commit 43c6cf1

Browse files
refactor: c++ 14
1 parent ecae43e commit 43c6cf1

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,8 @@ if(CLR_CMAKE_PLATFORM_XPLAT)
372372
-D__STDC_WANT_LIB_EXT1__=1
373373
)
374374

375-
set(CMAKE_CXX_STANDARD 11)
375+
set(CMAKE_CXX_STANDARD 14)
376+
set(CMAKE_CXX_STANDARD_REQUIRED On)
376377

377378
# todo: fix general visibility of the interface
378379
# do not set to `fvisibility=hidden` as it is going to
@@ -393,7 +394,6 @@ if(CLR_CMAKE_PLATFORM_XPLAT)
393394
-Wno-invalid-offsetof\
394395
-Wno-undefined-inline\
395396
-Wno-inconsistent-missing-override\
396-
-Wno-c++14-extensions\
397397
-Wno-macro-redefined\
398398
-Wno-pragmas\
399399
-Wno-invalid-token-paste\

bin/ch/WScriptJsrt.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
//-------------------------------------------------------------------------------------------------------
22
// Copyright (C) Microsoft Corporation and contributors. All rights reserved.
3-
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
3+
// Copyright (c) ChakraCore Project Contributors. All rights reserved.
44
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
55
//-------------------------------------------------------------------------------------------------------
66
#include "stdafx.h"
77
#include "PlatformAgnostic/ChakraICU.h"
8+
#ifdef __valid
9+
#undef __valid
10+
#endif
811
#if defined(__APPLE__)
912
#ifdef ctime
1013
#undef ctime

0 commit comments

Comments
 (0)