Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup declaration of ModelInterface's SharedPtrs #33

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −14
Open

cleanup declaration of ModelInterface's SharedPtrs #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/urdf_model/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ URDF_TYPEDEF_CLASS_POINTER(Mesh);
URDF_TYPEDEF_CLASS_POINTER(Sphere);
URDF_TYPEDEF_CLASS_POINTER(Visual);

URDF_TYPEDEF_CLASS_POINTER(ModelInterface);

// create *_pointer_cast functions in urdf namespace
template<class T, class U>
std::shared_ptr<T> const_pointer_cast(std::shared_ptr<U> const & r)
Expand Down
13 changes: 2 additions & 11 deletions include/urdf_world/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,7 @@
#ifndef URDF_WORLD_TYPES_H
#define URDF_WORLD_TYPES_H

#include <memory>


namespace urdf{

class ModelInterface;

// typedef shared pointers
typedef std::shared_ptr<ModelInterface> ModelInterfaceSharedPtr;

}
#warning urdf_world/types.h is deprecated. Please use urdf_model/types.h instead.
#include <urdf_model/types.h>

#endif
4 changes: 1 addition & 3 deletions include/urdf_world/world.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,9 @@
#include <vector>
#include <map>

#include "urdf_model/model.h"
#include "urdf_model/types.h"
#include "urdf_model/pose.h"
#include "urdf_model/twist.h"
#include "urdf_world/types.h"

namespace urdf{

Expand Down Expand Up @@ -107,4 +106,3 @@ class World
}

#endif