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.

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

Fixed compilation errors when SRT is configured with --disable-logging option (#616) #632

Merged
merged 2 commits into from
Apr 5, 2019
Merged

Fixed compilation errors when SRT is configured with --disable-logging option (#616) #632

merged 2 commits into from
Apr 5, 2019

Conversation

maxtomilov
Copy link
Contributor

No description provided.

@maxtomilov maxtomilov changed the title fixed compilation errors when SRT is configured with --disable-logging option (#616) Fixed compilation errors when SRT is configured with --disable-logging option (#616) Apr 3, 2019
@maxsharabayko maxsharabayko added this to the v.1.3.3 milestone Apr 3, 2019
@maxsharabayko maxsharabayko added [core] Area: Changes in SRT library core Type: Bug Indicates an unexpected problem or unintended behavior labels Apr 3, 2019
@maxsharabayko
Copy link
Collaborator

Fixes #616

Copy link
Collaborator

@maxsharabayko maxsharabayko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please replace tabs on line 870 of common.cpp and further. Although not related to your changes, but gradually we need to format the code properly.

#endif

} // (end namespace srt_logging)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am thinking if it is better to move #if ENABLE_LOGGING to line 841 instead (right above the namespace declaration).

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. I think it's better to move the #if ENABLE_LOGGING up to the place before namespace srt_logging starts. None of these are required when logging is not enabled.

@rndi rndi merged commit fc78683 into Haivision:master Apr 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[core] Area: Changes in SRT library core Type: Bug Indicates an unexpected problem or unintended behavior
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants