From 05cd41fb0310430792e60dea8ab6942c016f59ab Mon Sep 17 00:00:00 2001
From: Differential Privacy Team <noreply@google.com>
Date: Tue, 4 Jun 2024 08:53:30 -0700
Subject: [PATCH] Use std::optional and std::make_unique in favor of absl::* in
 C++

Change-Id: Ia6bdcdd058d7aeb8e17e71a20c5c4e86a003c58a
GitOrigin-RevId: 549aaa2bf32936824b027b2481d710eb801cb6d8
---
 cc/algorithms/bounded-sum.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/cc/algorithms/bounded-sum.h b/cc/algorithms/bounded-sum.h
index 9c619327..784ad2c0 100644
--- a/cc/algorithms/bounded-sum.h
+++ b/cc/algorithms/bounded-sum.h
@@ -21,6 +21,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
 #include <limits>
 #include <memory>
 #include <optional>
@@ -476,14 +477,14 @@ class BoundedSum<T>::Builder {
   }
 
  private:
-  absl::optional<double> epsilon_;
+  std::optional<double> epsilon_;
   double delta_ = 0;
-  absl::optional<T> upper_;
-  absl::optional<T> lower_;
+  std::optional<T> upper_;
+  std::optional<T> lower_;
   int max_partitions_contributed_ = 1;
   int max_contributions_per_partition_ = 1;
   std::unique_ptr<NumericalMechanismBuilder> mechanism_builder_ =
-      absl::make_unique<LaplaceMechanism::Builder>();
+      std::make_unique<LaplaceMechanism::Builder>();
   std::unique_ptr<ApproxBounds<T>> approx_bounds_;
 
   absl::StatusOr<std::unique_ptr<BoundedSum<T>>> BuildSumWithFixedBounds() {
@@ -495,7 +496,7 @@ class BoundedSum<T>::Builder {
                        upper_.value()));
 
     return absl::StatusOr<std::unique_ptr<BoundedSum<T>>>(
-        absl::make_unique<BoundedSumWithFixedBounds<T>>(
+        std::make_unique<BoundedSumWithFixedBounds<T>>(
             epsilon_.value(), delta_, lower_.value(), upper_.value(),
             std::move(mechanism)));
   }
@@ -520,7 +521,7 @@ class BoundedSum<T>::Builder {
     }
 
     return absl::StatusOr<std::unique_ptr<BoundedSum<T>>>(
-        absl::make_unique<BoundedSumWithApproxBounds<T>>(
+        std::make_unique<BoundedSumWithApproxBounds<T>>(
             epsilon_.value(), delta_, max_partitions_contributed_,
             max_contributions_per_partition_, mechanism_builder_->Clone(),
             std::move(approx_bounds_)));