Skip to content

Undefine ERROR macro when build on Windows #545

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

Closed
felixf4xu wants to merge 1 commit into from
Closed

Undefine ERROR macro when build on Windows #545

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
4 changes: 4 additions & 0 deletions diagnostic_aggregator/include/diagnostic_aggregator/generic_analyzer_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@

#include "rclcpp/rclcpp.hpp"

#ifdef ERROR
#undef ERROR //DiagnosticStatus::ERROR conflicts with Windows.h ERROR definition
#endif

namespace diagnostic_aggregator
{
/*!
Expand Down
4 changes: 4 additions & 0 deletions diagnostic_aggregator/include/diagnostic_aggregator/other_analyzer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@

#include "rclcpp/rclcpp.hpp"

#ifdef ERROR
#undef ERROR
#endif

namespace diagnostic_aggregator
{
/*
Expand Down
4 changes: 4 additions & 0 deletions diagnostic_aggregator/include/diagnostic_aggregator/status_item.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@

#include "rclcpp/rclcpp.hpp"

#ifdef ERROR
#undef ERROR
#endif

namespace diagnostic_aggregator
{
/*!
Expand Down
4 changes: 4 additions & 0 deletions diagnostic_aggregator/src/aggregator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
#include <string>
#include <vector>

#ifdef ERROR
#undef ERROR
#endif

namespace diagnostic_aggregator
{
using std::placeholders::_1;
Expand Down
4 changes: 4 additions & 0 deletions diagnostic_aggregator/src/analyzer_group.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
#include <vector>
#include <regex>

#ifdef ERROR
#undef ERROR
#endif

PLUGINLIB_EXPORT_CLASS(diagnostic_aggregator::AnalyzerGroup, diagnostic_aggregator::Analyzer)

namespace diagnostic_aggregator
Expand Down
4 changes: 4 additions & 0 deletions diagnostic_updater/src/example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@

#include "rclcpp/rclcpp.hpp"

#ifdef ERROR
#undef ERROR
#endif

using namespace std::chrono_literals;

double time_to_launch;
Expand Down
4 changes: 4 additions & 0 deletions diagnostic_updater/test/diagnostic_status_wrapper_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
#include "diagnostic_updater/diagnostic_status_wrapper.hpp"
#include "diagnostic_msgs/msg/diagnostic_status.hpp"

#ifdef ERROR
#undef ERROR
#endif

TEST(DiagnosticStatusWrapper, testDiagnosticStatusWrapperDefaultConstructor) {
// A default constructed DiagnosticStatusWrapper should be empty.
diagnostic_updater::DiagnosticStatusWrapper dsw;
Expand Down
4 changes: 4 additions & 0 deletions diagnostic_updater/test/diagnostic_updater_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@

#include "rclcpp_lifecycle/lifecycle_node.hpp"

#ifdef ERROR
#undef ERROR
#endif

using namespace std::chrono_literals;

class TestClass
Expand Down
4 changes: 4 additions & 0 deletions self_test/example/selftest_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@

#include "self_test/test_runner.hpp"

#ifdef ERROR
#undef ERROR
#endif

class MyNode : public rclcpp::Node
{
private:
Expand Down
4 changes: 4 additions & 0 deletions self_test/test/selftest_node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@

#include "self_test/test_runner.hpp"

#ifdef ERROR
#undef ERROR
#endif

/*
*\author Kevin Watts
*\brief Returns nominal self-test values
Expand Down
Loading