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

Make some changes for newer versions of uncrustify #1173

Closed
wants to merge 1 commit into from
Closed

Make some changes for newer versions of uncrustify #1173

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
40 changes: 20 additions & 20 deletions rviz_common/src/rviz_common/logging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,44 +38,44 @@

namespace
{

// *INDENT-OFF*
static rviz_common::LoggingHandler __debug_logging_handler = [](
const std::string & message,
const std::string & file_name,
size_t line_number)
{
printf(
"[rviz_common:debug] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
{
printf(
"[rviz_common:debug] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
static rviz_common::LoggingHandler __info_logging_handler = [](
const std::string & message,
const std::string & file_name,
size_t line_number)
{
printf(
"[rviz_common:info] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
{
printf(
"[rviz_common:info] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
static rviz_common::LoggingHandler __warning_logging_handler = [](
const std::string & message,
const std::string & file_name,
size_t line_number)
{
fprintf(
stderr,
"[rviz_common:warning] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
{
fprintf(
stderr,
"[rviz_common:warning] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
static rviz_common::LoggingHandler __error_logging_handler = [](
const std::string & message,
const std::string & file_name,
size_t line_number)
{
fprintf(
stderr,
"[rviz_common:error] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
{
fprintf(
stderr,
"[rviz_common:error] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};

static std::mutex __logging_mutex;

// *INDENT-ON*
} // namespace

namespace rviz_common
Expand Down
2 changes: 2 additions & 0 deletions ...iz_default_plugins/displays/interactive_markers/interactive_marker_namespace_property.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
// *INDENT-OFF*
#ifndef /* NOLINT */ \
RVIZ_DEFAULT_PLUGINS__DISPLAYS__INTERACTIVE_MARKERS__INTERACTIVE_MARKER_NAMESPACE_PROPERTY_HPP_
#define /* NOLINT */ \
RVIZ_DEFAULT_PLUGINS__DISPLAYS__INTERACTIVE_MARKERS__INTERACTIVE_MARKER_NAMESPACE_PROPERTY_HPP_
// *INDENT-ON*

#include <string>

Expand Down
40 changes: 20 additions & 20 deletions rviz_rendering/src/rviz_rendering/logging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,44 +38,44 @@

namespace
{

// *INDENT-OFF*
static rviz_rendering::LoggingHandler __debug_logging_handler = [](
const std::string & message,
const std::string & file_name,
size_t line_number)
{
printf(
"[rviz_rendering:debug] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
{
printf(
"[rviz_rendering:debug] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
static rviz_rendering::LoggingHandler __info_logging_handler = [](
const std::string & message,
const std::string & file_name,
size_t line_number)
{
printf(
"[rviz_rendering:info] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
{
printf(
"[rviz_rendering:info] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
static rviz_rendering::LoggingHandler __warning_logging_handler = [](
const std::string & message,
const std::string & file_name,
size_t line_number)
{
fprintf(
stderr,
"[rviz_rendering:warning] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
{
fprintf(
stderr,
"[rviz_rendering:warning] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
static rviz_rendering::LoggingHandler __error_logging_handler = [](
const std::string & message,
const std::string & file_name,
size_t line_number)
{
fprintf(
stderr,
"[rviz_rendering:error] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};
{
fprintf(
stderr,
"[rviz_rendering:error] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
};

static std::mutex __logging_mutex;

// *INDENT-ON*
} // namespace

namespace rviz_rendering
Expand Down