Skip to content

Commit

Permalink
upgraded windows workflow to VS 2022 and removed unused variable
Browse files Browse the repository at this point in the history
  • Loading branch information
wsobel committed Sep 22, 2024
1 parent 86f098d commit 39da3d6
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ on:

jobs:
build_windows:
runs-on: windows-2019
name: "Windows 2019 Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}"
runs-on: windows-2022
name: "Windows 2022 Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}"
strategy:
matrix:
arch: ["x86", "amd64"]
Expand Down
1 change: 1 addition & 0 deletions conan/profiles/vs32
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ arch=x86
compiler.runtime=static
compiler.runtime_type=Release
build_type=Release
compiler.version=194

1 change: 1 addition & 0 deletions conan/profiles/vs32debug
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ arch=x86
compiler.runtime=static
compiler.runtime_type=Debug
build_type=Debug
compiler.version=194
1 change: 1 addition & 0 deletions conan/profiles/vs32shared
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ arch=x86
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release
compiler.version=194

[options]
shared=True
3 changes: 2 additions & 1 deletion conan/profiles/vs64
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ compiler.cppstd=17
arch=x86_64
compiler.runtime=static
compiler.runtime_type=Release
build_type=Release
build_type=Release
compiler.version=194
2 changes: 1 addition & 1 deletion conan/profiles/vs64debug
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ arch=x86_64
compiler.runtime=static
compiler.runtime_type=Debug
build_type=Debug

compiler.version=194
1 change: 1 addition & 0 deletions conan/profiles/vs64shared
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ arch=x86_64
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release
compiler.version=194

[options]
shared=True
Expand Down
3 changes: 0 additions & 3 deletions src/mtconnect/agent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -909,9 +909,6 @@ namespace mtconnect {
{
NAMED_SCOPE("Agent::initializeDataItems");

// Grab data from configuration
string time = getCurrentTime(GMT_UV_SEC);

// Initialize the id mapping for the devices and set all data items to UNAVAILABLE
for (auto item : device->getDeviceDataItems())
{
Expand Down

0 comments on commit 39da3d6

Please sign in to comment.