Skip to content

Commit 7a5b3f4

Browse files
offaoffa
committed
Merge branch 'master' into 216-transport_api
2 parents 5f84065 + 2b764b2 commit 7a5b3f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+64
-52
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,5 +143,5 @@ jobs:
143143
- uses: DoozyX/clang-format-lint-action@master
144144
name: "Verify formatting"
145145
with:
146-
clangFormatVersion: 15
146+
clangFormatVersion: 16
147147

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
script/ci_setup.sh
1919
apt-get install -y libboost-system-dev
2020
- name: CodeQL Initialization
21-
uses: github/codeql-action/init@v2
21+
uses: github/codeql-action/init@v3
2222
with:
2323
languages: cpp
2424
queries: +security-and-quality
2525
- name: Build
2626
run: script/ci_build.sh
2727
- name: CodeQL Analysis
28-
uses: github/codeql-action/analyze@v2
28+
uses: github/codeql-action/analyze@v3

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020-2023 offa
3+
Copyright (c) 2020-2024 offa
44
Copyright (c) 2019 Adam Wegrzynek
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy

‎README.md‎

Lines changed: 1 addition & 1 deletion

‎conanfile.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ def requirements(self):
5858
if not self.options.system and self.options.boost:
5959
self.requires("boost/1.83.0")
6060
if self.options.tests:
61-
self.requires("catch2/3.5.0")
62-
self.requires("trompeloeil/46")
61+
self.requires("catch2/3.5.2")
62+
self.requires("trompeloeil/47")
6363

6464
def generate(self):
6565
tc = CMakeToolchain(self)

‎include/InfluxDB.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2020-2023 offa
3+
// Copyright (c) 2020-2024 offa
44
// Copyright (c) 2019 Adam Wegrzynek
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy

‎include/InfluxDBException.h‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2020-2023 offa
3+
// Copyright (c) 2020-2024 offa
44
// Copyright (c) 2019 Adam Wegrzynek
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -54,21 +54,33 @@ namespace influxdb
5454

5555

5656
/// \deprecated Use InfluxDBException instead - will be removed in v0.8.0
57-
class [[deprecated("Use InfluxDBException instead - will be removed in v0.8.0")]] NonExistentDatabase : public InfluxDBException{
58-
public :
59-
NonExistentDatabase(const std::string& source, const std::string& message) : InfluxDBException("influx-cxx [" + source + "]: " + message){}
57+
class [[deprecated("Use InfluxDBException instead - will be removed in v0.8.0")]] NonExistentDatabase : public InfluxDBException
58+
{
59+
public:
60+
NonExistentDatabase(const std::string& source, const std::string& message)
61+
: InfluxDBException("influx-cxx [" + source + "]: " + message)
62+
{
63+
}
6064
};
6165

6266
/// \deprecated Use InfluxDBException instead - will be removed in v0.8.0
63-
class [[deprecated("Use InfluxDBException instead - will be removed in v0.8.0")]] BadRequest : public InfluxDBException{
64-
public :
65-
BadRequest(const std::string& source, const std::string& message) : InfluxDBException("influx-cxx [" + source + "]: " + message){}
67+
class [[deprecated("Use InfluxDBException instead - will be removed in v0.8.0")]] BadRequest : public InfluxDBException
68+
{
69+
public:
70+
BadRequest(const std::string& source, const std::string& message)
71+
: InfluxDBException("influx-cxx [" + source + "]: " + message)
72+
{
73+
}
6674
};
6775

6876
/// \deprecated Use InfluxDBException instead - will be removed in v0.8.0
69-
class [[deprecated("Use InfluxDBException instead - will be removed in v0.8.0")]] ServerError : public InfluxDBException{
70-
public :
71-
ServerError(const std::string& source, const std::string& message) : InfluxDBException("influx-cxx [" + source + "]: " + message){}
77+
class [[deprecated("Use InfluxDBException instead - will be removed in v0.8.0")]] ServerError : public InfluxDBException
78+
{
79+
public:
80+
ServerError(const std::string& source, const std::string& message)
81+
: InfluxDBException("influx-cxx [" + source + "]: " + message)
82+
{
83+
}
7284
};
7385

7486
/// \deprecated Use InfluxDBException instead - will be removed in v0.8.0

‎include/InfluxDBFactory.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2020-2023 offa
3+
// Copyright (c) 2020-2024 offa
44
// Copyright (c) 2019 Adam Wegrzynek
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy

‎include/Point.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2020-2023 offa
3+
// Copyright (c) 2020-2024 offa
44
// Copyright (c) 2019 Adam Wegrzynek
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy

‎include/Proxy.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MIT License
22
//
3-
// Copyright (c) 2020-2023 offa
3+
// Copyright (c) 2020-2024 offa
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy
66
// of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)