From 77fa17b176ec1442492ffb0a61a2dc667b5f6607 Mon Sep 17 00:00:00 2001
From: Mirko Waechter <mirko.waechter@kit.edu>
Date: Wed, 13 Aug 2014 21:33:11 +0200
Subject: [PATCH] Moved initialization from FactoryRegistration variable to cpp
---
.../RobotAPI/robotstate/remote/CMakeLists.txt | 1 +
.../remote/RobotStateObjectFactories.cpp | 27 +++++++++++++++++++
.../remote/RobotStateObjectFactories.h | 2 +-
3 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 source/RobotAPI/robotstate/remote/RobotStateObjectFactories.cpp
diff --git a/source/RobotAPI/robotstate/remote/CMakeLists.txt b/source/RobotAPI/robotstate/remote/CMakeLists.txt
index e2467fb00..8bacbed24 100644
--- a/source/RobotAPI/robotstate/remote/CMakeLists.txt
+++ b/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
diff --git a/source/RobotAPI/robotstate/remote/RobotStateObjectFactories.cpp b/source/RobotAPI/robotstate/remote/RobotStateObjectFactories.cpp
new file mode 100644
index 000000000..af1999ea3
--- /dev/null
+++ b/source/RobotAPI/robotstate/remote/RobotStateObjectFactories.cpp
@@ -0,0 +1,27 @@
+/*
+* 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());
diff --git a/source/RobotAPI/robotstate/remote/RobotStateObjectFactories.h b/source/RobotAPI/robotstate/remote/RobotStateObjectFactories.h
index 75fd46891..d9bf208af 100644
--- a/source/RobotAPI/robotstate/remote/RobotStateObjectFactories.h
+++ b/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());
}
}
--
GitLab