Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-01 02:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Storage, NetworkConnection: Don't in-place construct atomics.

Browse Source 
Visual C++ 2013 doesn't support this.
This commit is contained in:
Peter Johnson
2015-07-20 20:52:26 -07:00
parent 8bbe5f9fdb
commit 0979c1c9ca
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/NetworkConnection.cpp
View File

@@ -17,9 +17,10 @@ using namespace nt;
NetworkConnection::NetworkConnection(std::unique_ptr<TCPStream> stream,
Message::GetEntryTypeFunc get_entry_type)
: m_stream(std::move(stream)),
m_get_entry_type(get_entry_type),
m_active(false),
m_proto_rev(0x0300) {}
m_get_entry_type(get_entry_type) {
m_active = false;
m_proto_rev = 0x0300;
}
NetworkConnection::~NetworkConnection() { Stop(); }

2
src/Storage.h
View File

@@ -26,7 +26,7 @@ class StorageTest;
class StorageEntry {
public:
StorageEntry() : m_flags(0), m_id(0xffff) {}
StorageEntry() : m_id(0xffff) { m_flags = 0; }
bool IsPersistent() const { return (m_flags & NT_PERSISTENT) != 0; }