Changing y2016 to absl::call_once()
Change-Id: I327fceef13f310ea657c1c0a71ba58960e2f1e3b
diff --git a/y2016/constants.cc b/y2016/constants.cc
index 8518b6b..2b75345 100644
--- a/y2016/constants.cc
+++ b/y2016/constants.cc
@@ -13,7 +13,7 @@
#include "aos/logging/logging.h"
#include "aos/mutex/mutex.h"
#include "aos/network/team_number.h"
-#include "aos/once.h"
+#include "absl/base/call_once.h"
#include "y2016/control_loops/drivetrain/polydrivetrain_dog_motor_plant.h"
#include "y2016/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
@@ -146,17 +146,20 @@
}
}
-const Values *DoGetValues() {
+void DoGetValues(const Values **result) {
uint16_t team = ::aos::network::GetTeamNumber();
AOS_LOG(INFO, "creating a Constants for team %" PRIu16 "\n", team);
- return DoGetValuesForTeam(team);
+ *result = DoGetValuesForTeam(team);
+ return;
}
} // namespace
const Values &GetValues() {
- static ::aos::Once<const Values> once(DoGetValues);
- return *once.Get();
+ static absl::once_flag once;
+ static const Values *result;
+ absl::call_once(once, DoGetValues, &result);
+ return *result;
}
const Values &GetValuesForTeam(uint16_t team_number) {