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

Backport/optional log fill attr from profiles [6740] #823

Merged
merged 5 commits into from
Nov 9, 2019
Merged

Backport/optional log fill attr from profiles [6740] #823

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c8daed
Refs #6715: Optional flag log_error for showing and error if profiles…
EduPonz Oct 25, 2019
c3deff9
Uncrustify corrections
EduPonz Oct 25, 2019
d0e2197
Naming conventions
EduPonz Oct 25, 2019
81073fa
optional log_error true by default
EduPonz Oct 25, 2019
1b33f1c
Minor errors in the documentation
EduPonz Nov 7, 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
12 changes: 6 additions & 6 deletions include/fastrtps/xmlparser/XMLProfileManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ class XMLProfileManager
* @param profile_name Name for the profile to be used to fill the structure.
* @param atts Structure to be filled.
* @param log_error Flag to log an error if the profile_name is not found.
* @return XMLP_ret::XML_OK on success, XMLP_ret::XML_ERROR in other case.
* @return XMLP_ret::XML_OK on success, XMLP_ret::XML_ERROR in other case. Defaults true.
MiguelCompany marked this conversation as resolved.
Show resolved Hide resolved
*/
RTPS_DllAPI static XMLP_ret fillParticipantAttributes(
const std::string& profile_name,
ParticipantAttributes& atts,
bool log_error = false);
bool log_error = true);

//!Fills participant_attributes with the default values.
RTPS_DllAPI static void getDefaultParticipantAttributes(
Expand All @@ -111,12 +111,12 @@ class XMLProfileManager
* @param profile_name Name for the profile to be used to fill the structure.
* @param atts Structure to be filled.
* @param log_error Flag to log an error if the profile_name is not found.
* @return XMLP_ret::XML_OK on success, XMLP_ret::XML_ERROR in other case.
* @return XMLP_ret::XML_OK on success, XMLP_ret::XML_ERROR in other case. Defaults true.
MiguelCompany marked this conversation as resolved.
Show resolved Hide resolved
*/
RTPS_DllAPI static XMLP_ret fillPublisherAttributes(
const std::string& profile_name,
PublisherAttributes& atts,
bool log_error = false);
bool log_error = true);

//!Fills publisher_attributes with the default values.
RTPS_DllAPI static void getDefaultPublisherAttributes(
Expand All @@ -127,12 +127,12 @@ class XMLProfileManager
* @param profile_name Name for the profile to be used to fill the structure.
* @param atts Structure to be filled.
* @param log_error Flag to log an error if the profile_name is not found.
* @return XMLP_ret::XML_OK on success, XMLP_ret::XML_ERROR in other case.
* @return XMLP_ret::XML_OK on success, XMLP_ret::XML_ERROR in other case. Defaults true.
MiguelCompany marked this conversation as resolved.
Show resolved Hide resolved
*/
RTPS_DllAPI static XMLP_ret fillSubscriberAttributes(
const std::string& profile_name,
SubscriberAttributes& atts,
bool log_error = false);
bool log_error = true);

//!Fills subscriber_attributes with the default values.
RTPS_DllAPI static void getDefaultSubscriberAttributes(
Expand Down