style changes

moveit · Jul 21, 2016 · 5b44738 · 5b44738
1 parent fd6a020
commit 5b44738
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/...eption/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.h b/...eption/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.h
@@ -123,10 +123,16 @@ class OccupancyMapMonitor
   }
 
   /** \brief Enable sending diffs of the occupancy map */
-  void enableOctomapDiff(bool enable) { octomap_diff_enable = enable; }
+  void setOctomapDiff(bool enable)
+  {
+    octomap_diff_enable_ = enable;
+  }
 
   /** \brief Returns if sending diffs of the occupancy map is enabled */
-  bool isOctomapDiffEnabled() const { return octomap_diff_enable; }
+  bool isOctomapDiffEnabled() const
+  {
+    return octomap_diff_enable_;
+  }
 
 private:
 
@@ -147,7 +153,7 @@ class OccupancyMapMonitor
 
   OccMapTreePtr tree_;
   OccMapTreeConstPtr tree_const_;
-  bool octomap_diff_enable;
+  bool octomap_diff_enable_;
 
   boost::scoped_ptr<pluginlib::ClassLoader<OccupancyMapUpdater> > updater_plugin_loader_;
   std::vector<OccupancyMapUpdaterPtr> map_updaters_;

diff --git a/perception/occupancy_map_monitor/src/occupancy_map_monitor.cpp b/perception/occupancy_map_monitor/src/occupancy_map_monitor.cpp
@@ -87,11 +87,11 @@ void OccupancyMapMonitor::initialize()
   tree_.reset(new OccMapTree(map_resolution_));
   tree_const_ = tree_;
 
-  octomap_diff_enable = false;
-  if (nh_.getParam("octomap_diff", octomap_diff_enable))
+  octomap_diff_enable_ = false;
+  if (nh_.getParam("octomap_diff", octomap_diff_enable_))
   {
-    if (octomap_diff_enable) ROS_INFO("Octomap diff enabled");
-    tree_->enableChangeDetection(octomap_diff_enable);
+    if (octomap_diff_enable_) ROS_INFO("Octomap diff enabled");
+    tree_->enableChangeDetection(octomap_diff_enable_);
   }
 
   XmlRpc::XmlRpcValue sensor_list;