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

artf4107: GetInstance() calls are now atomic

Browse Source 
C++11 guarantees construction of static variables to be atomic, so this patch takes advantage of that.

Change-Id: I4a3db0f19c5fa5461fef3b6b63d7b8fec596c962
This commit is contained in:
Tyler Veness
2015-06-24 04:25:10 -07:00
parent 368ad30d37
commit faedfa6ed4
11 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wpilibc/wpilibC++Sim/include/simulation/MainNode.h
View File

@@ -10,10 +10,8 @@ using namespace gazebo;
class MainNode {
public:
static MainNode* GetInstance() {
if (instance == nullptr) {
instance = new MainNode();
}
return instance;
static MainNode instance;
return &instance;
}
template<typename M>
@@ -39,8 +37,6 @@ public:
transport::NodePtr main;
private:
static MainNode* instance;
MainNode() {
gazebo::transport::init();
main = transport::NodePtr(new transport::Node());