improve TopicManager::instance (#770)

ros · Mar 18, 2016 · 8a0b80c · 8a0b80c
1 parent c0bdb08
commit 8a0b80c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
 project(roscpp)
 
 if(NOT WIN32)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra")
 endif()
 
 find_package(catkin REQUIRED COMPONENTS

diff --git a/clients/roscpp/src/libros/topic_manager.cpp b/clients/roscpp/src/libros/topic_manager.cpp
@@ -53,20 +53,10 @@ using namespace std; // sigh
 namespace ros
 {
 
-TopicManagerPtr g_topic_manager;
-boost::mutex g_topic_manager_mutex;
 const TopicManagerPtr& TopicManager::instance()
 {
-  if (!g_topic_manager)
-  {
-    boost::mutex::scoped_lock lock(g_topic_manager_mutex);
-    if (!g_topic_manager)
-    {
-      g_topic_manager = boost::make_shared<TopicManager>();
-    }
-  }
-
-  return g_topic_manager;
+  static TopicManagerPtr topic_manager = boost::make_shared<TopicManager>();
+  return topic_manager;
 }
 
 TopicManager::TopicManager()