From b61727916dbda8b3d62ac40fa2b2d010066821e2 Mon Sep 17 00:00:00 2001
From: FHIR Team <no-reply@google.com>
Date: Tue, 23 Jun 2026 05:28:05 -0700
Subject: [PATCH] Automated Code Change

PiperOrigin-RevId: 936599601
---
 cc/google/fhir/fhir_path/fhir_path.cc | 36 +++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/cc/google/fhir/fhir_path/fhir_path.cc b/cc/google/fhir/fhir_path/fhir_path.cc
index 11be531a1ed..35e22fc21d8 100644
--- a/cc/google/fhir/fhir_path/fhir_path.cc
+++ b/cc/google/fhir/fhir_path/fhir_path.cc
@@ -2810,7 +2810,7 @@ class MemberOfFunction : public SingleValueFunctionNode {
       if (system_field == nullptr) {
         system_field = coding.GetDescriptor()->FindFieldByName("system");
       }
-      absl::optional<std::string> system = absl::nullopt;
+      absl::optional<std::string> system = std::nullopt;
       if (system_field != nullptr &&
           coding.GetReflection()->HasField(coding, system_field)) {
         FHIR_ASSIGN_OR_RETURN(
@@ -2851,7 +2851,7 @@ class MemberOfFunction : public SingleValueFunctionNode {
       } else if (IsCode(*element.Message())) {
         FHIR_ASSIGN_OR_RETURN(
             bool is_member,
-            CodeIsMember(*element.Message(), /*code_system=*/absl::nullopt,
+            CodeIsMember(*element.Message(), /*code_system=*/std::nullopt,
                          value_set_id, work_space));
         membership_results.push_back(is_member);
       } else if (IsString(*element.Message())) {
@@ -3063,13 +3063,13 @@ class ComparisonOperator : public BinaryOperator {
                                              int32_t right) const {
     switch (comparison_type_) {
       case kLessThan:
-        return absl::make_optional(left < right);
+        return std::make_optional(left < right);
       case kGreaterThan:
-        return absl::make_optional(left > right);
+        return std::make_optional(left > right);
       case kLessThanEqualTo:
-        return absl::make_optional(left <= right);
+        return std::make_optional(left <= right);
       case kGreaterThanEqualTo:
-        return absl::make_optional(left >= right);
+        return std::make_optional(left >= right);
     }
   }
 
@@ -3087,20 +3087,20 @@ class ComparisonOperator : public BinaryOperator {
 
     switch (comparison_type_) {
       case kLessThan:
-        return absl::make_optional(left < right);
+        return std::make_optional(left < right);
       case kGreaterThan:
-        return absl::make_optional(left > right);
+        return std::make_optional(left > right);
       case kLessThanEqualTo:
         // Fallback to literal comparison for equality to avoid
         // rounding errors.
-        return absl::make_optional(
+        return std::make_optional(
             left <= right ||
             (left_message->GetDescriptor() == right_message->GetDescriptor() &&
              MessageDifferencer::Equals(*left_message, *right_message)));
       case kGreaterThanEqualTo:
         // Fallback to literal comparison for equality to avoid
         // rounding errors.
-        return absl::make_optional(
+        return std::make_optional(
             left >= right ||
             (left_message->GetDescriptor() == right_message->GetDescriptor() &&
              MessageDifferencer::Equals(*left_message, *right_message)));
@@ -3131,13 +3131,13 @@ class ComparisonOperator : public BinaryOperator {
 
     switch (comparison_type_) {
       case kLessThan:
-        return absl::make_optional(compare_result < 0);
+        return std::make_optional(compare_result < 0);
       case kGreaterThan:
-        return absl::make_optional(compare_result > 0);
+        return std::make_optional(compare_result > 0);
       case kLessThanEqualTo:
-        return absl::make_optional(compare_result <= 0);
+        return std::make_optional(compare_result <= 0);
       case kGreaterThanEqualTo:
-        return absl::make_optional(compare_result >= 0);
+        return std::make_optional(compare_result >= 0);
     }
   }
 
@@ -3201,13 +3201,13 @@ class ComparisonOperator : public BinaryOperator {
 
     switch (comparison_type_) {
       case kLessThan:
-        return absl::make_optional(time_difference < 0);
+        return std::make_optional(time_difference < 0);
       case kGreaterThan:
-        return absl::make_optional(time_difference > 0);
+        return std::make_optional(time_difference > 0);
       case kLessThanEqualTo:
-        return absl::make_optional(time_difference <= 0);
+        return std::make_optional(time_difference <= 0);
       case kGreaterThanEqualTo:
-        return absl::make_optional(time_difference >= 0);
+        return std::make_optional(time_difference >= 0);
     }
   }