From 87ba4d0ebc033baf2923e28fe027e4bf019cdfd2 Mon Sep 17 00:00:00 2001 From: pleroy Date: Sat, 25 Feb 2023 17:37:59 +0100 Subject: [PATCH] Everything compiles. --- base/not_null.hpp | 6 ++++-- base/status_utilities.hpp | 2 +- base/version.hpp | 2 ++ generate_version_translation_unit.ps1 | 6 +++++- geometry/pair.hpp | 4 ++-- journal/recorder.cpp | 5 +++-- ksp_plugin/interface.cpp | 1 + ksp_plugin/part_subsets.cpp | 6 +++--- ksp_plugin_test/flight_plan_test.cpp | 1 - 9 files changed, 21 insertions(+), 12 deletions(-) diff --git a/base/not_null.hpp b/base/not_null.hpp index dc11acf37d..4bde1a4f54 100644 --- a/base/not_null.hpp +++ b/base/not_null.hpp @@ -342,6 +342,9 @@ template not_null check_not_null(not_null pointer); #endif +template +not_null> make_not_null_shared(Args&&... args); + // Factory for a |not_null>|, forwards the arguments to the // constructor of T. |make_not_null_unique(args)| is interchangeable with // |check_not_null(make_unique(args))|, but does not perform a |CHECK|, since @@ -364,10 +367,9 @@ not_null dynamic_cast_not_null(not_null>&& pointer); using internal::check_not_null; using internal::dynamic_cast_not_null; +using internal::make_not_null_shared; using internal::make_not_null_unique; using internal::not_null; -using internal::NotNullStorage; -using internal::operator<<; using internal::remove_not_null; } // namespace _not_null diff --git a/base/status_utilities.hpp b/base/status_utilities.hpp index 92ad189aae..1b8d9ebbee 100644 --- a/base/status_utilities.hpp +++ b/base/status_utilities.hpp @@ -26,7 +26,7 @@ absl::Status const& GetStatus(absl::StatusOr const& s) { do { \ /* Using _status below to avoid capture problems if expr is "status". */ \ ::absl::Status const _status = \ - (::principia::base::internal_status_utilities::GetStatus(expr)); \ + (::principia::base::_status_utilities::internal::GetStatus(expr)); \ if (!_status.ok()) \ return _status; \ } while (false) diff --git a/base/version.hpp b/base/version.hpp index 8faa0f7818..d8dde8d1c7 100644 --- a/base/version.hpp +++ b/base/version.hpp @@ -16,6 +16,8 @@ extern char const Version[]; } // namespace internal +using internal::BuildDate; +using internal::Version; } // namespace _version } // namespace base diff --git a/generate_version_translation_unit.ps1 b/generate_version_translation_unit.ps1 index ea5f7e5fe6..0ed75f43ad 100644 --- a/generate_version_translation_unit.ps1 +++ b/generate_version_translation_unit.ps1 @@ -12,11 +12,15 @@ $versionheadertext = [string]::format( "`n" + "namespace principia {{`n" + "namespace base {{`n" + + "namespace _version {{`n" + + "namespace internal {{`n" + "`n" + - "char const BuildDate[] = `"{0:yyyy'-'MM'-'dd'T'HH':'mm':'ssK}`";`n" + + "char const BuildDate[] = `"{0:yyyy'-'MM'-'dd'T'HH':'mm':'ssK}`";`n" + "char const Version[] =`n" + " u8`"{1}`";`n" + "`n" + + "}} // namespace internal`n" + + "}} // namespace _version`n" + "}} // namespace base`n" + "}} // namespace principia`n", $newdate.ToUniversalTime(), diff --git a/geometry/pair.hpp b/geometry/pair.hpp index a7dafcb686..e3f777676e 100644 --- a/geometry/pair.hpp +++ b/geometry/pair.hpp @@ -22,6 +22,8 @@ namespace internal_pair { using quantities::Difference; using quantities::Product; using quantities::Quotient; +using namespace principia::base::_not_constructible; +using namespace principia::base::_not_null; template class Pair; @@ -209,8 +211,6 @@ using internal_pair::vector_of; namespace internal_barycentre_calculator { using quantities::Difference; -using namespace principia::base::_not_constructible; -using namespace principia::base::_not_null; template class BarycentreCalculator, Weight> final { diff --git a/journal/recorder.cpp b/journal/recorder.cpp index f878834ef0..37a3c079eb 100644 --- a/journal/recorder.cpp +++ b/journal/recorder.cpp @@ -14,6 +14,7 @@ namespace principia { using base::HexadecimalEncoder; using namespace principia::base::_array; using namespace principia::base::_serialization; +using namespace principia::base::_version; namespace journal { @@ -45,8 +46,8 @@ void Recorder::Activate(base::not_null const recorder) { active_recorder_->WriteAtConstruction(method); not_null const out = get_version->mutable_out(); - out->set_build_date(base::BuildDate); - out->set_version(base::Version); + out->set_build_date(BuildDate); + out->set_version(Version); active_recorder_->WriteAtDestruction(method); } diff --git a/ksp_plugin/interface.cpp b/ksp_plugin/interface.cpp index 6727fc2233..98076ef877 100644 --- a/ksp_plugin/interface.cpp +++ b/ksp_plugin/interface.cpp @@ -121,6 +121,7 @@ using quantities::si::Second; using quantities::si::Tonne; using ::google::protobuf::Arena; using ::google::protobuf::ArenaOptions; +using ::operator<<; using namespace principia::base::_array; using namespace principia::base::_fingerprint2011; using namespace principia::base::_flags; diff --git a/ksp_plugin/part_subsets.cpp b/ksp_plugin/part_subsets.cpp index 2d795c8c37..18bc8c7fcd 100644 --- a/ksp_plugin/part_subsets.cpp +++ b/ksp_plugin/part_subsets.cpp @@ -9,15 +9,15 @@ namespace principia { -using base::make_not_null_shared; +namespace base { + using geometry::Instant; using ksp_plugin::Barycentric; using ksp_plugin::Part; using ksp_plugin::PileUp; using physics::DegreesOfFreedom; using physics::Ephemeris; - -namespace base { +using namespace principia::base::_not_null; Subset::Properties::Properties(not_null const part) { if (part->is_piled_up()) { diff --git a/ksp_plugin_test/flight_plan_test.cpp b/ksp_plugin_test/flight_plan_test.cpp index f1a964e929..a81f832de4 100644 --- a/ksp_plugin_test/flight_plan_test.cpp +++ b/ksp_plugin_test/flight_plan_test.cpp @@ -31,7 +31,6 @@ namespace principia { namespace ksp_plugin { using astronomy::J2000; -using base::make_not_null_shared; using geometry::Barycentre; using geometry::Displacement; using geometry::Instant;