diff --git a/cc/google/fhir/json_parser.cc b/cc/google/fhir/json_parser.cc index 24e8c2064..fdbb61526 100644 --- a/cc/google/fhir/json_parser.cc +++ b/cc/google/fhir/json_parser.cc @@ -130,14 +130,14 @@ const std::unordered_map& GetFieldMap( const intptr_t memo_key = reinterpret_cast(descriptor); { - absl::ReaderMutexLock reader_lock(&memos_mutex); + absl::ReaderMutexLock reader_lock(memos_mutex); const auto iter = memos->find(memo_key); if (iter != memos->end()) { return *iter->second; } } - absl::MutexLock lock(&memos_mutex); + absl::MutexLock lock(memos_mutex); // Check if anything created and wrote the new entry while we were waiting // on the lock @@ -176,7 +176,7 @@ absl::StatusOr GetContainedResourceField( const std::string contained_resource_name( contained_resource_desc->full_name()); { - absl::ReaderMutexLock reader_lock(&field_table_mutex); + absl::ReaderMutexLock reader_lock(field_table_mutex); auto field_table_iter = field_table->find(contained_resource_name); if (field_table_iter != field_table->end()) { const FieldDescriptor* field = (*field_table_iter->second)[resource_type]; @@ -189,7 +189,7 @@ absl::StatusOr GetContainedResourceField( } } - absl::MutexLock lock(&field_table_mutex); + absl::MutexLock lock(field_table_mutex); auto field_map = BuildResourceTypeMap(contained_resource_desc); const FieldDescriptor* field = (*field_map)[resource_type]; (*field_table)[contained_resource_name] = std::move(field_map); diff --git a/cc/google/fhir/profiles_lib.cc b/cc/google/fhir/profiles_lib.cc index bd1380f32..2c6aa025d 100644 --- a/cc/google/fhir/profiles_lib.cc +++ b/cc/google/fhir/profiles_lib.cc @@ -72,7 +72,7 @@ const bool SharesCommonAncestor(const ::google::protobuf::Descriptor* first, const std::string& first_url = GetStructureDefinitionUrl(first); const std::string& second_url = GetStructureDefinitionUrl(second); - absl::MutexLock lock(&memos_mutex); + absl::MutexLock lock(memos_mutex); const auto& first_url_memo_entry = memos[first_url]; const auto& memo_entry = first_url_memo_entry.find(second_url); if (memo_entry != first_url_memo_entry.end()) { @@ -100,14 +100,14 @@ const std::unordered_map GetExtensionMap( const intptr_t memo_key = (intptr_t)descriptor; { - absl::ReaderMutexLock l(&memos_mutex); + absl::ReaderMutexLock l(memos_mutex); const auto iter = memos->find(memo_key); if (iter != memos->end()) { return iter->second; } } - absl::MutexLock lock(&memos_mutex); + absl::MutexLock lock(memos_mutex); auto& extension_map = (*memos)[memo_key]; for (int i = 0; i < descriptor->field_count(); i++) { const FieldDescriptor* field = descriptor->field(i);