Skip to content

Commit

Permalink
world.h: remove initXml function, tinyxml include (#39)
Browse files Browse the repository at this point in the history
* world.h: forward declare tinyxml and don't include

The urdf::World class uses a pointer to a
tinyxml symbol in the initXml function,
but we don't want to export that dependency,
so just forward declare the symbol since it's a pointer.

* Remove the unimplemented initXml method.

This allows us to remove tinyxml.h from the header file.

Signed-off-by: Chris Lalancette <[email protected]>
  • Loading branch information
scpeters authored Oct 10, 2017
1 parent 6394957 commit 995aa1e
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions urdf_world/include/urdf_world/world.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,12 @@
*/

#ifndef USDF_STATE_H
#define USDF_STATE_H
#ifndef URDF_WORLD_H
#define URDF_WORLD_H

#include <string>
#include <vector>
#include <map>
#include <tinyxml.h>

#include "urdf_model/model.h"
#include "urdf_model/pose.h"
Expand All @@ -100,8 +99,6 @@ class World

std::vector<Entity> models;

void initXml(TiXmlElement* config);

void clear()
{
this->name.clear();
Expand Down

0 comments on commit 995aa1e

Please sign in to comment.