Skip to content

Fix parameter name mismatch. #3795

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
tvislavski merged 3 commits into from
Mar 26, 2025
Merged

Fix parameter name mismatch. #3795

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
b476cd9
Fix parameter name mismatch.
silvio2402 Jan 28, 2025
bc18aa1
Merge branch 'master' into name-mismatch
silvio2402 Jan 28, 2025
dfd2b29
Merge branch 'master' into name-mismatch
silvio2402 Mar 26, 2025
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 cpp/src/phonenumbers/asyoutypeformatter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class AsYouTypeFormatter {
// Check to see if there is an exact pattern match for these digits. If so, we
// should use this instead of any other formatting template whose
// leadingDigitsPattern also matches the input.
void AttemptToFormatAccruedDigits(string* formatted_number);
void AttemptToFormatAccruedDigits(string* formatted_result);

// Combines the national number with any prefix (IDD/+ and country code or
// national prefix) that was collected. A space will be inserted between them
Expand Down
6 changes: 3 additions & 3 deletions cpp/src/phonenumbers/phonenumberutil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ class PhoneNumberUtil : public Singleton<PhoneNumberUtil> {
// Gets the national significant number of a phone number. Note a national
// significant number doesn't contain a national prefix or any formatting.
void GetNationalSignificantNumber(const PhoneNumber& number,
string* national_significant_num) const;
string* national_number) const;

// Gets the length of the geographical area code from the PhoneNumber object
// passed in, so that clients could use it to split a national significant
Expand Down Expand Up @@ -930,7 +930,7 @@ class PhoneNumberUtil : public Singleton<PhoneNumberUtil> {
const PhoneNumber& number,
const PhoneMetadata& metadata,
PhoneNumberFormat number_format,
string* extension) const;
string* formatted_number) const;

void GetRegionCodeForNumberFromRegionList(
const PhoneNumber& number,
Expand Down Expand Up @@ -962,7 +962,7 @@ class PhoneNumberUtil : public Singleton<PhoneNumberUtil> {
int ExtractCountryCode(string* national_number) const;
ErrorType MaybeExtractCountryCode(
const PhoneMetadata* default_region_metadata,
bool keepRawInput,
bool keep_raw_input,
string* national_number,
PhoneNumber* phone_number) const;

Expand Down