diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-10-16 05:53:57 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-16 05:53:57 -0700 |
| commit | df82d21f320285a8f4cbf16756d8e035cdc74e7c (patch) | |
| tree | afcd50cab8df40d04a753bdac1b5cef03676d626 | |
| parent | d5828e6df60362b0f05c23c0c8109ba916466a7a (diff) | |
| download | vcpkg-df82d21f320285a8f4cbf16756d8e035cdc74e7c.tar.gz vcpkg-df82d21f320285a8f4cbf16756d8e035cdc74e7c.zip | |
[vcpkg] Fix OSX build for old GCC versions
| -rw-r--r-- | toolsrc/include/vcpkg/globalstate.h | 4 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/globalstate.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/toolsrc/include/vcpkg/globalstate.h b/toolsrc/include/vcpkg/globalstate.h index 2a76c8741..ae66ca355 100644 --- a/toolsrc/include/vcpkg/globalstate.h +++ b/toolsrc/include/vcpkg/globalstate.h @@ -22,6 +22,8 @@ namespace vcpkg struct CtrlCStateMachine { + CtrlCStateMachine(); + void transition_to_spawn_process() noexcept; void transition_from_spawn_process() noexcept; void transition_handle_ctrl_c() noexcept; @@ -34,7 +36,7 @@ namespace vcpkg exit_requested, }; - std::atomic<CtrlCState> m_state = CtrlCState::normal; + std::atomic<CtrlCState> m_state; }; static CtrlCStateMachine g_ctrl_c_state; diff --git a/toolsrc/src/vcpkg/globalstate.cpp b/toolsrc/src/vcpkg/globalstate.cpp index ee576f9ce..a54c596fb 100644 --- a/toolsrc/src/vcpkg/globalstate.cpp +++ b/toolsrc/src/vcpkg/globalstate.cpp @@ -17,6 +17,8 @@ namespace vcpkg GlobalState::CtrlCStateMachine GlobalState::g_ctrl_c_state; + GlobalState::CtrlCStateMachine::CtrlCStateMachine() : m_state(CtrlCState::normal) {} + void GlobalState::CtrlCStateMachine::transition_to_spawn_process() noexcept { auto expected = CtrlCState::normal; |