Skip to content

Commit 7b171ca

Browse files
remove ubuntu 23.10 CI, change std::auto_ptr to std::unique_ptr (#167)
* remove deprecated ubuntu 23.10 docker from github workflow * replace std::auto_ptr with std::unique_ptr * debug no-libtiff workflow * install libtiff in valgrind workflows
1 parent 0af8d00 commit 7b171ca

File tree

7 files changed

+22
-42
lines changed

7 files changed

+22
-42
lines changed

.github/workflows/docker_linuxes.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,6 @@ jobs:
9696
- name: Run unit tests (ctest) within the Docker image
9797
run: docker run ctl:latest sh -c "cd ./build && ctest"
9898

99-
ubuntu-23-10:
100-
101-
runs-on: ubuntu-latest
102-
103-
steps:
104-
- uses: actions/checkout@v4
105-
- name: Build the Docker image
106-
run: docker build --no-cache --rm -f ./docker/Dockerfile_ubuntu_23.10 -t ctl:latest .
107-
108-
- name: Run unit tests (ctest) within the Docker image
109-
run: docker run ctl:latest sh -c "cd ./build && ctest"
110-
11199
ubuntu-latest:
112100

113101
runs-on: ubuntu-latest

.github/workflows/ubuntu_debug.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,9 @@ jobs:
182182
- name: remove openexr
183183
run: sudo apt-get --purge remove libopenexr-dev -y
184184

185+
- name: install libtiff
186+
run: sudo apt-get -y install libtiff-dev
187+
185188
- name: install openexr dependency - zlib
186189
run: sudo apt-get -y install zlib1g-dev
187190

@@ -251,6 +254,9 @@ jobs:
251254
- name: remove openexr
252255
run: sudo apt-get --purge remove libopenexr-dev -y
253256

257+
- name: install libtiff
258+
run: sudo apt-get -y install libtiff-dev
259+
254260
- name: install openexr dependency - zlib
255261
run: sudo apt-get -y install zlib1g-dev
256262

.github/workflows/ubuntu_no_libtiff.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ jobs:
2626
- name: remove libtiff
2727
run: sudo apt-get --purge remove libtiff-dev -y
2828

29+
- name: install openexr
30+
run: sudo apt-get -y install libopenexr-dev
31+
2932
- uses: actions/checkout@v4
3033

3134
- name: Configure CMake
@@ -48,6 +51,9 @@ jobs:
4851
- name: remove libtiff-dev
4952
run: sudo apt-get --purge remove libtiff-dev -y
5053

54+
- name: install openexr
55+
run: sudo apt-get -y install libopenexr-dev
56+
5157
- uses: actions/checkout@v4
5258

5359
- name: Configure CMake

.github/workflows/ubuntu_release.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323

2424
steps:
2525

26+
- name: install libtiff
27+
run: sudo apt-get -y install libtiff-dev
28+
2629
- name: install ilmbase
2730
run: sudo apt-get -y install libilmbase-dev
2831

@@ -268,6 +271,9 @@ jobs:
268271
- name: remove openexr
269272
run: sudo apt-get --purge remove libopenexr-dev -y
270273

274+
- name: install libtiff
275+
run: sudo apt-get -y install libtiff-dev
276+
271277
- name: install openexr dependency - zlib
272278
run: sudo apt-get -y install zlib1g-dev
273279

@@ -320,6 +326,9 @@ jobs:
320326
- name: remove openexr
321327
run: sudo apt-get --purge remove libopenexr-dev -y
322328

329+
- name: install libtiff
330+
run: sudo apt-get -y install libtiff-dev
331+
323332
- name: install openexr dependency - zlib
324333
run: sudo apt-get -y install zlib1g-dev
325334

docker/Dockerfile_ubuntu_23.10

Lines changed: 0 additions & 26 deletions
This file was deleted.

lib/IlmCtl/CtlExc.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ void CtlExc::_explain(const char *text, va_list _ap) {
9191
}
9292

9393
operator=(ptr);
94+
9495
}
9596

9697
CtlExc::CtlExc(const char *format, ...) throw() {

lib/IlmCtl/CtlInterpreter.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,7 @@ void Interpreter::_loadModule(const std::string &moduleName,
303303
// set up the source code string for parsing.
304304
//
305305

306-
#if __cplusplus >= 201103L
307306
std::unique_ptr<istream> input;
308-
#else
309-
std::auto_ptr<istream> input;
310-
#endif
311307

312308
if (!moduleSource.empty())
313309
{

0 commit comments

Comments
 (0)