diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-06-09 16:03:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 16:03:19 +0200 |
| commit | 328c87c87e1e4f29561cfcd182c328377ef81a16 (patch) | |
| tree | b2ee9799473f42b66f09b9af3e3b0c44b722f4bd | |
| parent | 5650c5ce9e20862e78087ca818427366669dff67 (diff) | |
| parent | a4dc39467c66fdae4e3b6698558108b36492526b (diff) | |
| download | ATCD-328c87c87e1e4f29561cfcd182c328377ef81a16.tar.gz | |
Merge pull request #1136 from jwillemsen/jwi-azureubuntu
Move some jobs to ubuntu 20.04
| -rw-r--r-- | .github/workflows/linux.yml | 4 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_macros.h | 5 | ||||
| -rw-r--r-- | TAO/tao/params.h | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b7b7a860f45..c2663c37440 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -60,7 +60,7 @@ jobs: CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - imagename: ubuntu-18.04 + imagename: ubuntu-20.04 - name: CLANG5 CC: clang-5.0 CXX: clang++-5.0 @@ -98,7 +98,7 @@ jobs: PackageDeps: clang-10 Repo: llvm-toolchain-$(lsb_release -cs)-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - imagename: ubuntu-18.04 + imagename: ubuntu-20.04 runs-on: ${{ matrix.imagename }} env: ACE_ROOT: ${{ github.workspace }}/ACE diff --git a/ACE/ace/OS_NS_macros.h b/ACE/ace/OS_NS_macros.h index 10a6b970575..8f94cdad952 100644 --- a/ACE/ace/OS_NS_macros.h +++ b/ACE/ace/OS_NS_macros.h @@ -67,10 +67,9 @@ #endif /* !ACE_WIN32 */ -// Helper functions to split large intergers into smaller high-order +// Helper functions to split large integers into smaller high-order // and low-order parts, and reconstitute them again. These are // required primarily for supporting _FILE_OFFSET_BITS==64 on windows. - #if defined(ACE_WIN32) # if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS==64) # include "ace/Basic_Types.h" @@ -105,8 +104,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* _FILE_OFFSET_BITS==64 */ #endif /* ACE_WIN32 */ - - # include /**/ "ace/post.h" #endif /* ACE_OS_NS_MACROS_H */ diff --git a/TAO/tao/params.h b/TAO/tao/params.h index 59e548e0b3a..891e828d415 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -42,8 +42,6 @@ typedef ACE_Unbounded_Queue_Const_Iterator<ACE_CString> TAO_EndpointSetIterator; // ------------------------------------------------------------------- - - /** * @class TAO_ORB_Parameters * |