Skip to content

Commit 1cde61e

Browse files
authored
Merge pull request #1157 from redboltz/miyanyan-timespec
Miyanyan timespec
2 parents 1876bad + 8023a85 commit 1cde61e

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

.github/workflows/coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v1
18+
- uses: actions/checkout@v3
1919
- name: Install build dependencies
2020
run: |
2121
sudo apt-get update
@@ -24,7 +24,7 @@ jobs:
2424
2525
- name: Cache boost
2626
id: cache-boost
27-
uses: actions/cache@v1
27+
uses: actions/cache@v3
2828
with:
2929
path: ~/boost-prefix/
3030
key: ${{ runner.os }}-boost-1-85-0-2024-05-27
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Cache zlib
3737
id: cache-zlib
38-
uses: actions/cache@v1
38+
uses: actions/cache@v3
3939
with:
4040
path: ~/zlib-prefix/
4141
key: ${{ runner.os }}-zlib-64-1-2-11-2021-08-09

.github/workflows/gha.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
8585
linux:
8686
name: ${{ format('Linux (pattern {0})', matrix.pattern) }}
87-
runs-on: ubuntu-20.04
87+
runs-on: ubuntu-24.04
8888
strategy:
8989
fail-fast: false
9090
matrix:
@@ -136,15 +136,15 @@ jobs:
136136
137137
case ${{ matrix.pattern }} in
138138
0)
139-
export CXX="clang++-10"
139+
export CXX="clang++"
140140
export MSGPACK_CXX_VERSION="MSGPACK_CXX11=ON"
141141
;;
142142
1)
143143
export CXX="g++-10"
144144
export MSGPACK_CXX_VERSION="MSGPACK_CXX11=ON"
145145
;;
146146
2)
147-
export CXX="clang++-10"
147+
export CXX="clang++"
148148
export MSGPACK_CXX_VERSION="MSGPACK_CXX14=ON"
149149
;;
150150
3)
@@ -153,7 +153,7 @@ jobs:
153153
export MSGPACK_USE_STD_VARIANT_ADAPTOR="MSGPACK_USE_STD_VARIANT_ADAPTOR=ON"
154154
;;
155155
4)
156-
export CXX="clang++-10"
156+
export CXX="clang++"
157157
export MSGPACK_CXX_VERSION="MSGPACK_CXX20=ON"
158158
export NO_BOOST="-DMSGPACK_NO_BOOST"
159159
;;
@@ -162,23 +162,23 @@ jobs:
162162
export ARCH=32
163163
;;
164164
6)
165-
export CXX="clang++-10"
165+
export CXX="clang++"
166166
export API_VERSION=2
167167
;;
168168
7)
169169
export CXX="g++-10"
170170
export API_VERSION=1
171171
;;
172172
8)
173-
export CXX="clang++-10"
173+
export CXX="clang++"
174174
export CHAR_SIGN="unsigned"
175175
;;
176176
9)
177177
export CXX="g++-10"
178178
export X3_PARSE="ON"
179179
;;
180180
10)
181-
export CXX="clang++-10"
181+
export CXX="clang++"
182182
export ACTION="ci/build_regression.sh"
183183
;;
184184
11)

include/msgpack/v1/adaptor/cpp11/timespec.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "msgpack/versioning.hpp"
1414
#include "msgpack/adaptor/adaptor_base.hpp"
1515
#include "msgpack/object.hpp"
16-
#include "msgpack/object.hpp"
1716

1817
#include <ctime>
1918

0 commit comments

Comments
 (0)