Revision: 8448
http://playerstage.svn.sourceforge.net/playerstage/?rev=8448&view=rev
Author: natepak
Date: 2009-12-04 21:32:54 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
Removed stats message from cmake, and fixed memory leak in GazeboMessage
Modified Paths:
--------------
code/gazebo/trunk/server/CMakeLists.txt
code/gazebo/trunk/server/GazeboMessage.hh
code/gazebo/trunk/server/Simulator.cc
code/gazebo/trunk/server/physics/bullet/CMakeLists.txt
Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt 2009-12-04 18:12:19 UTC (rev
8447)
+++ code/gazebo/trunk/server/CMakeLists.txt 2009-12-04 21:32:54 UTC (rev
8448)
@@ -4,9 +4,6 @@
# Include all the search paths for headers
STRING (REPLACE " " ";" threadpool_include_dirs_split
"${threadpool_include_dirs}")
-
-message(status
"\n\n\nhihi\n\n\n${CMAKE_SOURCE_DIR}/3rd_party/assimp/include\n\n\n")
-
INCLUDE_DIRECTORIES(
.
${CMAKE_SOURCE_DIR}/libgazebo
Modified: code/gazebo/trunk/server/GazeboMessage.hh
===================================================================
--- code/gazebo/trunk/server/GazeboMessage.hh 2009-12-04 18:12:19 UTC (rev
8447)
+++ code/gazebo/trunk/server/GazeboMessage.hh 2009-12-04 21:32:54 UTC (rev
8448)
@@ -102,8 +102,13 @@
/// \brief True if logging data
private: bool logData;
-
- private: std::ostringstream nullStream;
+
+ private: class NullStream : public std::ostream
+ {
+ public: NullStream() : std::ios(0), std::ostream(0) {}
+ };
+
+ private: NullStream nullStream;
private: std::ostream *msgStream;
private: std::ostream *errStream;
private: std::ofstream logStream;
Modified: code/gazebo/trunk/server/Simulator.cc
===================================================================
--- code/gazebo/trunk/server/Simulator.cc 2009-12-04 18:12:19 UTC (rev
8447)
+++ code/gazebo/trunk/server/Simulator.cc 2009-12-04 21:32:54 UTC (rev
8448)
@@ -642,16 +642,12 @@
if (!this->IsPaused() || this->GetStepInc())
{
this->simTime += step;
- //this->SetPaused(false);
if (this->GetStepInc())
userStepped = true;
}
else
- {
this->pauseTime += step;
- // this->pause=true;
- }
lastTime = this->GetRealTime();
Modified: code/gazebo/trunk/server/physics/bullet/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/physics/bullet/CMakeLists.txt 2009-12-04
18:12:19 UTC (rev 8447)
+++ code/gazebo/trunk/server/physics/bullet/CMakeLists.txt 2009-12-04
21:32:54 UTC (rev 8448)
@@ -27,8 +27,6 @@
${FLTK_INCLUDE_DIR}
)
-message(status "\n\nha\n${bullet_dynamics_dirs}\n${boost_library_dirs}\n\n")
-
LINK_DIRECTORIES(
${CMAKE_BINARY_DIR}/libgazebo
${CMAKE_BINARY_DIR}/server/gui
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
