Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ jobs:
- CC: vs2022
CXX: vs2022
os: windows-2022
- CC: vs2026
CXX: vs2026
os: windows-2025
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }} ${{ matrix.CXX }}
env:
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,22 @@ jobs:
vcpkgarch: x64-windows
vcpkglibdir: lib
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
- name: VS2026Debug64
vmimage: windows-2025
mpctype: vs2026
BuildPlatform: x64
BuildConfiguration: Debug
vcpkgarch: x64-windows
vcpkglibdir: debug/lib
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
- name: VS2026Release64
vmimage: windows-2025
mpctype: vs2026
BuildPlatform: x64
BuildConfiguration: Release
vcpkgarch: x64-windows
vcpkglibdir: lib
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
runs-on: ${{ matrix.vmimage }}
name: ${{ matrix.name }}
env:
Expand Down
2 changes: 2 additions & 0 deletions ACE/NEWS
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
USER VISIBLE CHANGES BETWEEN ACE-8.0.6 and ACE-8.0.7
====================================================

. Added support for Visual Studio 2026

USER VISIBLE CHANGES BETWEEN ACE-8.0.5 and ACE-8.0.6
====================================================

Expand Down
29 changes: 29 additions & 0 deletions ACE/ace/config-win32-msvc-145.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* -*- C++ -*- */
//=============================================================================
/**
* @file config-win32-msvc-145.h
*
* @brief Microsoft Visual C++ 14.5 configuration file.
*
* This file is the ACE configuration file for Microsoft Visual C++ 14.5 (as released with Visual Studio 2026).
*
* @note Do not include this file directly, include config-win32.h instead.
*/
//=============================================================================

#ifndef ACE_CONFIG_WIN32_MSVC_145_H
#define ACE_CONFIG_WIN32_MSVC_145_H
#include /**/ "ace/pre.h"

#ifndef ACE_CONFIG_WIN32_H
#error Use config-win32.h in config.h instead of this header
#endif /* ACE_CONFIG_WIN32_H */

#ifndef ACE_WIN32_VC145
# define ACE_WIN32_VC145
#endif

#include "ace/config-win32-msvc-143.h"

#include /**/ "ace/post.h"
#endif /* ACE_CONFIG_WIN32_MSVC_145_H */
4 changes: 3 additions & 1 deletion ACE/ace/config-win32-msvc.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@
# define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS)

//FUZZ: disable check_for_msc_ver
#if (_MSC_VER >= 1930)
#if (_MSC_VER >= 1950)
# include "ace/config-win32-msvc-145.h"
#elif (_MSC_VER >= 1930)
# include "ace/config-win32-msvc-143.h"
#elif (_MSC_VER >= 1920)
# include "ace/config-win32-msvc-142.h"
Expand Down
3 changes: 3 additions & 0 deletions ACE/bin/MakeProjectCreator/config/acedefaults.mpb
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ feature(ace_languagestandard2017) {
specific(vs2017,vs2019,vs2022) {
LanguageStandard = stdcpp17
Comment thread
hwangsihu marked this conversation as resolved.
}
specific(vs2026) {
LanguageStandard = stdcpp20
}
Comment thread
hwangsihu marked this conversation as resolved.
Outdated
specific(cmake) {
languagestandard = 17
}
Expand Down
4 changes: 4 additions & 0 deletions ACE/bin/MakeProjectCreator/config/vs2026.features
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ssl=0
qos=1
rwho=0
sctp=0
36 changes: 36 additions & 0 deletions ACE/bin/MakeProjectCreator/config/vs2026nmake.mpb
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// -*- MPC -*-
feature (nmake_avoid_Wp64) {
specific(nmake) {
add_compile -= /Wp64
}
}

feature (nmake_avoid_Gm) {
specific(nmake) {
compile_flags -= /Gm
}
}

feature(vc_avoid_hides_local_declaration) {
specific(nmake) {
DisableSpecificWarnings += 4456
}
}

feature(vc_avoid_hides_global_declaration) {
specific(nmake) {
DisableSpecificWarnings += 4459
}
}

feature(vc_avoid_hides_class_member) {
specific(nmake) {
DisableSpecificWarnings += 4458
}
}

feature(ace_languagestandard2017) {
Comment thread
hwangsihu marked this conversation as resolved.
Outdated
specific(nmake) {
compile_flags += /std:c++20
}
}