Skip to content

Commit e232a31

Browse files
authored
Bump in edifice: ign-common4 (#85)
Signed-off-by: Louise Poubel <louise@openrobotics.org>
1 parent 3e4b414 commit e232a31

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

.github/ci/packages.apt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
libignition-cmake2-dev
2-
libignition-common3-dev
2+
libignition-common4-dev
33
libignition-math6-dev
44
libignition-msgs7-dev
55
libignition-plugin-dev

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77

88
env:
9-
PACKAGE: ignition-sensors4
9+
PACKAGE: ignition-sensors5
1010
runs-on: macos-latest
1111
steps:
1212
- uses: actions/checkout@v2

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
4848

4949
#--------------------------------------
5050
# Find ignition-common
51-
ign_find_package(ignition-common3
51+
ign_find_package(ignition-common4
5252
COMPONENTS profiler
5353
REQUIRED)
54-
set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR})
54+
set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
5555

5656
#--------------------------------------
5757
# Find ignition-transport

bitbucket-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pipelines:
2020
# Dependency: Ignition packages and sdformat
2121
- apt-get -y install
2222
libignition-cmake2-dev
23-
libignition-common3-dev
23+
libignition-common4-dev
2424
libignition-math6-dev
2525
libignition-msgs5-dev
2626
libignition-tools-dev

src/Sensor.cc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,16 @@ std::chrono::steady_clock::duration Sensor::NextDataUpdateTime() const
355355
//////////////////////////////////////////////////
356356
ignition::common::Time Sensor::NextUpdateTime() const
357357
{
358+
#ifndef _WIN32
359+
# pragma GCC diagnostic push
360+
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
361+
#endif
358362
std::pair<uint64_t, uint64_t> secNsec =
359363
math::durationToSecNsec(this->dataPtr->nextUpdateTime);
360364
return common::Time(secNsec.first, secNsec.second);
365+
#ifndef _WIN32
366+
# pragma GCC diagnostic pop
367+
#endif
361368
}
362369

363370
/////////////////////////////////////////////////

0 commit comments

Comments
 (0)