Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgraded C++ Version to 20 and Visual Studio to 2022 #490

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Upgraded C++ Version to 20 and Visual Studio to 2022 #490

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
90b57dc
upgraded to VS 2022 and C++ version 20
wsobel Sep 23, 2024
d2c1919
Merge branch 'main' into upgrade_to_cpp_20
wsobel Sep 23, 2024
ecc77fa
Version 2.4.0.3
wsobel Sep 23, 2024
1c18e31
Fixed title for windows build
wsobel Sep 23, 2024
46fe7d7
upgrade gtest to 1.15 and fixed macos build issue
wsobel Sep 23, 2024
ac8e44d
Merge branch 'main' into upgrade_to_cpp_20
wsobel Sep 24, 2024
ba01a70
Refactored Entity op == to equal() method to work around op == in chi…
wsobel Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ on:

jobs:
build_windows:
runs-on: windows-2019
runs-on: windows-2022
name: "Windows 2019 Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}"
strategy:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set(AGENT_VERSION_MAJOR 2)
set(AGENT_VERSION_MINOR 4)
set(AGENT_VERSION_PATCH 0)
set(AGENT_VERSION_BUILD 2)
set(AGENT_VERSION_BUILD 3)
set(AGENT_VERSION_RC "")

# This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent
Expand Down
1 change: 1 addition & 0 deletions conan/profiles/clang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ include(default)

[settings]
compiler.libcxx=libstdc++11
compiler.cppstd=20

[env]
CC=/usr/bin/clang
Expand Down
1 change: 1 addition & 0 deletions conan/profiles/docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ include(default)

[settings]
compiler.libcxx=libstdc++11
compiler.cppstd=20

[options]
without_ipv6=True
Expand Down
1 change: 1 addition & 0 deletions conan/profiles/gcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ include(default)

[settings]
compiler.libcxx=libstdc++11
compiler.cppstd=20

[system_tools]
cmake/>3.23.0
1 change: 1 addition & 0 deletions conan/profiles/gcc-appveyor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ include(default)
[settings]
compiler.libcxx=libstdc++11
compiler.version=11
compiler.cppstd=20

2 changes: 1 addition & 1 deletion conan/profiles/macos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(default)

[settings]
compiler=apple-clang
compiler.cppstd=gnu17
compiler.cppstd=20

[system_tools]
cmake/>3.26.0
3 changes: 2 additions & 1 deletion conan/profiles/vs32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ include(default)

[settings]
compiler=msvc
compiler.cppstd=17
compiler.cppstd=20
arch=x86
compiler.runtime=static
compiler.runtime_type=Release
build_type=Release
compiler.version=194


3 changes: 2 additions & 1 deletion conan/profiles/vs32debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ include(default)

[settings]
compiler=msvc
compiler.cppstd=17
compiler.cppstd=20
arch=x86
compiler.runtime=static
compiler.runtime_type=Debug
build_type=Debug
compiler.version=194

3 changes: 2 additions & 1 deletion conan/profiles/vs32shared
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ include(default)

[settings]
compiler=msvc
compiler.cppstd=17
compiler.cppstd=20
arch=x86
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release
compiler.version=194


[options]
Expand Down
3 changes: 2 additions & 1 deletion conan/profiles/vs64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ include(default)

[settings]
compiler=msvc
compiler.cppstd=17
compiler.cppstd=20
arch=x86_64
compiler.runtime=static
compiler.runtime_type=Release
build_type=Release
compiler.version=194
4 changes: 3 additions & 1 deletion conan/profiles/vs64debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ include(default)

[settings]
compiler=msvc
compiler.cppstd=17
compiler.cppstd=20
arch=x86_64
compiler.runtime=static
compiler.runtime_type=Debug
build_type=Debug
compiler.version=194

3 changes: 2 additions & 1 deletion conan/profiles/vs64shared
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ include(default)

[settings]
compiler=msvc
compiler.cppstd=17
compiler.cppstd=20
arch=x86_64
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release
compiler.version=194

[options]
shared=True
Expand Down
3 changes: 2 additions & 1 deletion conan/profiles/vsxp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ include(default)
[settings]
compiler=msvc
arch=x86
compiler.cppstd=17
compiler.cppstd=20
compiler.runtime=static
compiler.runtime_type=Release
build_type=Release
compiler.toolset=v141_xp
compiler.version=194

[options]
winver=0x0501
Expand Down
2 changes: 1 addition & 1 deletion conan/profiles/xcode
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include(default)

[settings]
compiler.cppstd=17
compiler.cppstd=20

[system_tools]
cmake/>3.23.0
Expand Down
12 changes: 4 additions & 8 deletions src/mtconnect/entity/data_set.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,9 @@

#pragma once

#include <cmath>
#include <regex>
#include <set>
#include <boost/container/set.hpp>
#include <string>
#include <utility>
#include <variant>
#include <vector>

#include "mtconnect/config.hpp"
#include "mtconnect/logging.hpp"
Expand All @@ -33,10 +29,10 @@ namespace mtconnect::entity {
struct DataSetEntry;

/// @brief A set of data set entries
class AGENT_LIB_API DataSet : public std::set<DataSetEntry>
class DataSet : public boost::container::set<DataSetEntry>
{
public:
using base = std::set<DataSetEntry>;
using base = boost::container::set<DataSetEntry>;
using base::base;

/// @brief Get a entry for a key
Expand All @@ -55,7 +51,7 @@ namespace mtconnect::entity {

/// @brief Split the data set entries by space delimiters and account for the
/// use of single and double quotes as well as curly braces
bool parse(const std::string &s, bool table);
bool AGENT_LIB_API parse(const std::string &s, bool table);
};

/// @brief Data Set Value type enumeration
Expand Down
Loading