Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

source/RobotAPI/robotstate/remote/CMakeLists.txt

@@ -24,6 +24,7 @@ set(LIB_FILES ArmarPose.cpp
             RemoteRobot.cpp
             RemoteRobotNode.cpp
             checks/ConditionCheckMagnitudeChecks.cpp
+            RobotStateObjectFactories.cpp
             )
 set(LIB_HEADERS ArmarPose.h
             LinkedPose.h

source/RobotAPI/robotstate/remote/RobotStateObjectFactories.cpp

+/*
+* This file is part of ArmarX.
+*
+* ArmarX is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License, or (at your option) any later version.
+*
+* ArmarX is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+* @package    ArmarX::
+* @author     Mirko Waechter ( mirko.waechter at kit dot edu)
+* @date       2014
+* @copyright  http://www.gnu.org/licenses/gpl.txt
+*             GNU General Public License
+*/
+
+#include "RobotStateObjectFactories.h"
+using namespace armarx;
+using namespace armarx::ObjectFactories;
+const FactoryCollectionBaseCleanUp RobotStateObjectFactories::RobotStateObjectFactoriesVar = FactoryCollectionBase::addToPreregistration(new RobotStateObjectFactories());

source/RobotAPI/robotstate/remote/RobotStateObjectFactories.h

@@ -169,8 +169,8 @@ namespace armarx
 
                 return map;
             }
+            static const FactoryCollectionBaseCleanUp RobotStateObjectFactoriesVar;
         };
-        const FactoryCollectionBaseCleanUp RobotStateObjectFactoriesVar = FactoryCollectionBase::addToPreregistration(new RobotStateObjectFactories());
 
     }
 }