Skip to content
Snippets Groups Projects
Commit b2e30895 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Add missing includes

parent 05657d2f
No related branches found
No related tags found
1 merge request!188ArMem Updates
#include "NJointTaskSpaceImpedanceDMPController.h"
#include <ArmarXCore/core/ArmarXObjectScheduler.h>
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include <ArmarXCore/core/logging/Logging.h>
namespace armarx
{
......
......@@ -5,7 +5,10 @@
#include <QWidget>
#include <QGroupBox>
#include <RobotAPI/libraries/aron/core/navigator/type/container/Object.h>
#include <ArmarXCore/core/logging/Logging.h>
#include <RobotAPI/libraries/aron/core/navigator/type/forward_declarations.h>
#include <RobotAPI/libraries/aron/core/Path.h>
#include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
......@@ -24,7 +27,7 @@ namespace armarx::armem::gui::instance
class WidgetsWithToolbar;
class InstanceView : public QWidget, public Logging
class InstanceView : public QWidget, public armarx::Logging
{
Q_OBJECT
using This = InstanceView;
......
......@@ -3,11 +3,13 @@
#include <Eigen/Core>
#include <Eigen/Geometry>
#include "ArmarXCore/core/exceptions/local/ExpressionException.h"
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include <ArmarXCore/core/logging/Logging.h>
#include <ArmarXCore/core/system/ArmarXDataPath.h>
#include <VirtualRobot/Robot.h>
namespace armarx::armem::articulated_object
{
armem::articulated_object::ArticulatedObject convert(const VirtualRobot::Robot& obj,
......@@ -46,4 +48,4 @@ namespace armarx::armem::articulated_object
return store(armemArticulatedObject);
}
} // namespace armarx::armem::articulated_object
\ No newline at end of file
} // namespace armarx::armem::articulated_object
......@@ -150,7 +150,7 @@ namespace armarx::aron::dataIO::reader
void NavigatorReader::readEndNDArray(unsigned char* data)
{
if (data == NULL)
if (data == nullptr)
{
throw error::AronException("NavigatorReader", "readEndNDArray", "The corresponding data pointer of an complex aron ptr is NULL.");
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment