Skip to content

Commit 1a9f73f

Browse files
committed
Some build and code cleanup
1 parent 1a6783c commit 1a9f73f

13 files changed

Lines changed: 17 additions & 19 deletions

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,6 @@ jobs:
216216
shared: ["True", "False"]
217217

218218
steps:
219-
- name: Set macOS deployment target
220-
run: echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV
221-
222219
- name: Checkout Agent
223220
uses: actions/checkout@v4
224221

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ set(CMAKE_CXX_STANDARD 20)
2727
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2828
set(CMAKE_CXX_EXTENSIONS OFF)
2929
set(CXX_COMPILE_FEATURES cxx_std_20)
30-
set(CMAKE_OSX_DEPLOYMENT_TARGET 13.3)
30+
set(CMAKE_OSX_DEPLOYMENT_TARGET 15.0)
3131

3232
project(cppagent LANGUAGES C CXX)
3333

‎src/mtconnect/source/adapter/agent_adapter/agent_adapter.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ namespace mtconnect::source::adapter::agent_adapter {
137137

138138
m_name = m_url.getUrlText(m_sourceDevice);
139139
m_identity = CreateIdentityHash(m_name);
140+
m_host = m_url.getHost();
140141

141142
m_options.insert_or_assign(configuration::AdapterIdentity, m_identity);
142143
m_feedbackId = "XmlTransformFeedback:" + m_identity;

‎test_package/data_item_mapping_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ class DataItemMappingTest : public testing::Test
106106
std::map<string, DataItemPtr> m_dataItems;
107107
};
108108

109-
inline DataSetEntry operator"" _E(const char *c, std::size_t) { return DataSetEntry(c); }
110-
inline TableCell operator"" _C(const char *c, std::size_t) { return TableCell(c); }
109+
inline DataSetEntry operator""_E(const char *c, std::size_t) { return DataSetEntry(c); }
110+
inline TableCell operator""_C(const char *c, std::size_t) { return TableCell(c); }
111111

112112
TEST_F(DataItemMappingTest, should_map_simple_sample)
113113
{

‎test_package/data_set_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ using namespace std::literals;
7777
using namespace chrono_literals;
7878
using namespace date::literals;
7979

80-
inline DataSetEntry operator"" _E(const char *c, std::size_t) { return DataSetEntry(c); }
80+
inline DataSetEntry operator""_E(const char *c, std::size_t) { return DataSetEntry(c); }
8181

8282
TEST_F(DataSetTest, DataItem)
8383
{

‎test_package/entity_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
4141
return RUN_ALL_TESTS();
4242
}
4343

44-
static inline int64_t operator"" _i64(unsigned long long int i) { return int64_t(i); }
44+
static inline int64_t operator""_i64(unsigned long long int i) { return int64_t(i); }
4545

4646
class EntityTest : public testing::Test
4747
{

‎test_package/json_helper.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
#include <nlohmann/json.hpp>
1919

20-
constexpr inline nlohmann::json::size_type operator"" _S(unsigned long long v)
20+
constexpr inline nlohmann::json::size_type operator""_S(unsigned long long v)
2121
{
2222
return static_cast<nlohmann::json::size_type>(v);
2323
}
2424

25-
inline std::string operator"" _S(const char *v, std::size_t) { return std::string(v); }
25+
inline std::string operator""_S(const char *v, std::size_t) { return std::string(v); }
2626

2727
static inline nlohmann::json find(nlohmann::json &array, const char *path, const char *value)
2828
{

‎test_package/json_mapping_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class JsonMappingTest : public testing::Test
135135
std::map<string, DevicePtr> m_devices;
136136
};
137137

138-
inline DataSetEntry operator"" _E(const char *c, std::size_t) { return DataSetEntry(c); }
138+
inline DataSetEntry operator""_E(const char *c, std::size_t) { return DataSetEntry(c); }
139139
using namespace date::literals;
140140

141141
/// @test verify the json mapper can map an object with a timestamp and a series of observations

‎test_package/json_printer_stream_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ class JsonPrinterStreamTest : public testing::Test
123123
std::list<DevicePtr> m_devices;
124124
};
125125

126-
Properties operator"" _value(unsigned long long value)
126+
Properties operator""_value(unsigned long long value)
127127
{
128128
return Properties {{"VALUE", int64_t(value)}};
129129
}
130130

131-
Properties operator"" _value(long double value) { return Properties {{"VALUE", double(value)}}; }
131+
Properties operator""_value(long double value) { return Properties {{"VALUE", double(value)}}; }
132132

133-
Properties operator"" _value(const char *value, size_t s)
133+
Properties operator""_value(const char *value, size_t s)
134134
{
135135
return Properties {{"VALUE", string(value)}};
136136
}

‎test_package/kinematics_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ using namespace std;
3636
using namespace mtconnect;
3737
using namespace mtconnect::entity;
3838

39-
inline DataSetEntry operator"" _E(const char *c, std::size_t) { return DataSetEntry(c); }
39+
inline DataSetEntry operator""_E(const char *c, std::size_t) { return DataSetEntry(c); }
4040

4141
// main
4242
int main(int argc, char *argv[])

0 commit comments

Comments
 (0)