Skip to content

Hex formatting #5157

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

Merged
merged 3 commits into from
Nov 2, 2019
Merged

Hex formatting #5157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d71a0b7
frame-archive.h: Reset to std::dec after hex formatting
bfulkers-i Oct 30, 2019
0c6cb3e
mf-uvc.cpp: Reset to std::dec after hex formatting
bfulkers-i Oct 30, 2019
5fcbff0
tm-context.cpp: Reset to std::dec after hex formatting
bfulkers-i Oct 30, 2019
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
2 changes: 1 addition & 1 deletion src/frame-archive.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ namespace librealsense
if (pending_frames > 0)
{
LOG_INFO("All frames from stream 0x"
<< std::hex << this << " are now released by the user");
<< std::hex << this << " are now released by the user" << std::dec);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/mf/mf-uvc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,13 +775,13 @@ namespace librealsense
if (!get_usb_descriptors(info.vid, info.pid, info.unique_id, _location, _device_usb_spec, _device_serial))
{
LOG_WARNING("Could not retrieve USB descriptor for device " << std::hex << info.vid << ":"
<< info.pid << " , id:" << info.unique_id);
<< info.pid << " , id:" << info.unique_id << std::dec);
}
}
catch (...)
{
LOG_WARNING("Accessing USB info failed for " << std::hex << info.vid << ":"
<< info.pid << " , id:" << info.unique_id);
<< info.pid << " , id:" << info.unique_id << std::dec);
}
foreach_uvc_device([this](const uvc_device_info& i, IMFActivate* device)
{
Expand Down
4 changes: 2 additions & 2 deletions src/tm2/tm-context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace librealsense
}
_t = std::thread(&tm2_context::thread_proc, this);

LOG_INFO("LibTm version 0x" << std::hex << _manager->version());
LOG_INFO("LibTm version 0x" << std::hex << _manager->version() << std::dec);
}
}

Expand Down Expand Up @@ -95,7 +95,7 @@ namespace librealsense

void tm2_context::onError(Status error, TrackingDevice* dev)
{
LOG_ERROR("Error occured while connecting device:" << dev << " Error: 0x" << std::hex << static_cast<int>(error));
LOG_ERROR("Error occured while connecting device:" << dev << " Error: 0x" << std::hex << static_cast<int>(error) << std::dec);
}

void tm2_context::thread_proc()
Expand Down