Skip to content

Commit

Permalink
Fix linter failures from includes (#110)
Browse files Browse the repository at this point in the history
* Fix linter failures from includes

* reorder

* Alphabetical order was fine how it was
  • Loading branch information
dhood authored Apr 4, 2018
1 parent ca30494 commit 48a373f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
11 changes: 8 additions & 3 deletions include/ros1_bridge/builtin_interfaces_factories.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
#ifndef ROS1_BRIDGE__BUILTIN_INTERFACES_FACTORIES_HPP_
#define ROS1_BRIDGE__BUILTIN_INTERFACES_FACTORIES_HPP_

#include <ros1_bridge/factory.hpp>

// include ROS 1 messages
#include <std_msgs/Duration.h>
#include <std_msgs/Time.h>
Expand All @@ -25,11 +23,18 @@
#include <builtin_interfaces/msg/duration.hpp>
#include <builtin_interfaces/msg/time.hpp>

#include <memory>
#include <string>

#include "ros1_bridge/factory.hpp"

namespace ros1_bridge
{

std::shared_ptr<FactoryInterface>
get_factory_builtin_interfaces(const std::string & ros1_type_name, const std::string & ros2_type_name);
get_factory_builtin_interfaces(
const std::string & ros1_type_name,
const std::string & ros2_type_name);

// conversion functions for available interfaces

Expand Down
11 changes: 8 additions & 3 deletions src/builtin_interfaces_factories.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <memory>
#include <string>

#include "rclcpp/rclcpp.hpp"

// include builtin interfaces
#include <ros1_bridge/builtin_interfaces_factories.hpp>
#include <ros1_bridge/convert_builtin_interfaces.hpp>
#include "ros1_bridge/builtin_interfaces_factories.hpp"
#include "ros1_bridge/convert_builtin_interfaces.hpp"

namespace ros1_bridge
{

std::shared_ptr<FactoryInterface>
get_factory_builtin_interfaces(const std::string & ros1_type_name, const std::string & ros2_type_name)
get_factory_builtin_interfaces(
const std::string & ros1_type_name,
const std::string & ros2_type_name)
{
// mapping from string to specialized template
if (
Expand Down

0 comments on commit 48a373f

Please sign in to comment.