diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-03-25 15:52:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-25 15:52:08 +0100 |
| commit | 8e31d326bb7543206982bcc53b6d8a0c7a103aa5 (patch) | |
| tree | ccbddd126faea38d2e16bea2974fb5f241e6692a | |
| parent | c2bb0005cf63ab06f9e991418fdee5b22a3c8db8 (diff) | |
| parent | 78a473da451683f676b20ead9a5a135b63d1b7a9 (diff) | |
| download | ATCD-8e31d326bb7543206982bcc53b6d8a0c7a103aa5.tar.gz | |
Merge pull request #1062 from jwillemsen/jwi-clang10
Add clang10 configuration
| -rw-r--r-- | ACE/ace/Select_Reactor_Base.cpp | 1 | ||||
| -rw-r--r-- | ACE/tests/Compiler_Features_32_Test.cpp | 2 | ||||
| -rw-r--r-- | azure-pipelines.yml | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp index 62b116907d6..6e6305e7b59 100644 --- a/ACE/ace/Select_Reactor_Base.cpp +++ b/ACE/ace/Select_Reactor_Base.cpp @@ -920,7 +920,6 @@ ACE_Select_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle, return -1; } - return 1; } diff --git a/ACE/tests/Compiler_Features_32_Test.cpp b/ACE/tests/Compiler_Features_32_Test.cpp index f51b9e16803..29590337a2f 100644 --- a/ACE/tests/Compiler_Features_32_Test.cpp +++ b/ACE/tests/Compiler_Features_32_Test.cpp @@ -46,7 +46,7 @@ void A::clear () { #if defined __clang__ && \ (defined __apple_build_version__ && __apple_build_version__ <= 11000033 \ - || __clang_major__ <= 9) + || __clang_major__ <= 10) #define CLANG_WORKAROUND #endif diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 89d06258ef5..83703451a08 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -228,6 +228,12 @@ jobs: PackageDeps: clang-9 Repo: llvm-toolchain-$(lsb_release -cs)-9 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU + CLANG10: + CC: clang-10 + CXX: clang++-10 + PackageDeps: clang-10 + Repo: llvm-toolchain-$(lsb_release -cs)-10 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU steps: - script: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - |