Skip to content

Commit

Permalink
Properly export parsePoseInternal to make Windows happy.
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Lalancette <[email protected]>
  • Loading branch information
clalancette committed Dec 20, 2023
1 parent f6830b9 commit 4827632
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 6 deletions.
4 changes: 2 additions & 2 deletions urdf_parser/src/joint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
#include <tinyxml2.h>
#include <urdf_parser/urdf_parser.h>

namespace urdf{
#include "./pose.hpp"

bool parsePoseInternal(Pose &pose, tinyxml2::XMLElement* xml);
namespace urdf{

bool parseJointDynamics(JointDynamics &jd, tinyxml2::XMLElement* config)
{
Expand Down
4 changes: 2 additions & 2 deletions urdf_parser/src/link.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
#include <tinyxml2.h>
#include <console_bridge/console.h>

namespace urdf{
#include "./pose.hpp"

bool parsePoseInternal(Pose &pose, tinyxml2::XMLElement* xml);
namespace urdf{

bool parseMaterial(Material &material, tinyxml2::XMLElement *config, bool only_name_is_ok)
{
Expand Down
2 changes: 2 additions & 0 deletions urdf_parser/src/pose.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
#include <tinyxml2.h>
#include <urdf_parser/urdf_parser.h>

#include "./pose.hpp"

namespace urdf_export_helpers {

std::string values2str(unsigned int count, const double *values, double (*conv)(double))
Expand Down
44 changes: 44 additions & 0 deletions urdf_parser/src/pose.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*********************************************************************
* Software License Agreement (BSD License)
*
* Copyright (c) 2008, Willow Garage, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
* * Neither the name of the Willow Garage nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*********************************************************************/

/* Author: Wim Meeussen, John Hsu */

#include <urdf_model/pose.h>
#include <tinyxml2.h>

namespace urdf {

URDFDOM_DLLAPI bool parsePoseInternal(Pose &pose, tinyxml2::XMLElement* xml);

}
4 changes: 2 additions & 2 deletions urdf_parser/src/urdf_sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@

#include <urdf_parser/urdf_parser.h>

namespace urdf{
#include "./pose.hpp"

bool parsePoseInternal(Pose &pose, tinyxml2::XMLElement* xml);
namespace urdf{

bool parseCameraInternal(Camera &camera, tinyxml2::XMLElement* config)
{
Expand Down

0 comments on commit 4827632

Please sign in to comment.