Skip to content

Commit 5142dca

Browse files
committed
Fix minor cpplint issues.
1 parent 21e86fb commit 5142dca

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,15 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
env:
18-
- {ROS_DISTRO: noetic}
18+
# You need a more modern version of spdlog than provided
19+
# by 20.04; in development could get it from a backports PPA
20+
# but can't during CI
21+
#- {ROS_DISTRO: noetic}
1922
- {ROS_DISTRO: jazzy}
2023
- {ROS_DISTRO: kilted}
2124
- {ROS_DISTRO: rolling}
2225

2326
steps:
24-
- name: Install dependencies with awalsh128/cache-apt-pkgs-action
25-
uses: awalsh128/cache-apt-pkgs-action@latest
26-
with:
27-
packages: libboost-all-dev libspdlog-dev libfmt-dev
28-
# Need a more modern version of spdlog than provided by 20.04
29-
add-repository: ppa:savoury1/backports
30-
version: 1.1
31-
3227
- name: Checkout repository
3328
uses: actions/checkout@v5
3429
with:

.github/workflows/ci_cmake.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
uses: awalsh128/cache-apt-pkgs-action@latest
1818
with:
1919
packages: libboost-all-dev libspdlog-dev libfmt-dev
20-
# Need a more modern version of spdlog than provided by 20.04
21-
add-repository: ppa:savoury1/backports
2220
version: 1.0
2321

2422
- name: Checkout repository

include/liboculus/Logger.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <spdlog/common.h>
3636
#include <spdlog/sinks/stdout_color_sinks.h>
3737
#include <spdlog/spdlog.h>
38+
#include <utility>
3839

3940
namespace liboculus {
4041

@@ -61,7 +62,7 @@ class Logger {
6162
Logger::get_logger()->sinks().push_back(s);
6263
}
6364

64-
~Logger() {};
65+
~Logger() {}
6566

6667
private:
6768
static std::shared_ptr<Logger>
@@ -70,12 +71,13 @@ class Logger {
7071
return std::shared_ptr<Logger>(new Logger(logger_in));
7172
}
7273

73-
Logger(const std::shared_ptr<spdlog::logger> &l = nullptr) : logger_(l) {
74+
explicit Logger(const std::shared_ptr<spdlog::logger> &l = nullptr)
75+
: logger_(l) {
7476
if (!logger_) {
7577
logger_ = std::make_shared<spdlog::logger>("liboculus");
7678
spdlog::register_logger(logger_);
7779
}
78-
};
80+
}
7981

8082
std::shared_ptr<spdlog::logger> logger_;
8183

0 commit comments

Comments
 (0)