From f45f39037c1e56f1efc07d518e42165b6b836162 Mon Sep 17 00:00:00 2001
From: pleroy <phl+personal@google.com>
Date: Sun, 1 Apr 2018 01:13:29 +0200
Subject: [PATCH] Fix some compilation errors.

---
 base/file_body.hpp                              |  1 +
 geometry/perspective_body.hpp                   |  6 ++----
 include_solution.props                          |  2 +-
 ksp_plugin_test/plugin_compatibility_test.cpp   |  1 +
 mathematica/local_error_analysis.cpp            |  2 +-
 testing_utilities/solar_system_factory_test.cpp | 15 ++++++++-------
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/base/file_body.hpp b/base/file_body.hpp
index b6ffc79a4a..d66be848c3 100644
--- a/base/file_body.hpp
+++ b/base/file_body.hpp
@@ -2,6 +2,7 @@
 
 #include "base/file.hpp"
 
+#include <filesystem>
 #include <string>
 
 #include "base/macros.hpp"
diff --git a/geometry/perspective_body.hpp b/geometry/perspective_body.hpp
index 246b7ad6fb..10ffb312c3 100644
--- a/geometry/perspective_body.hpp
+++ b/geometry/perspective_body.hpp
@@ -80,12 +80,10 @@ Perspective<FromFrame, ToFrame>::SegmentBehindFocalPlane(
         Barycentre<Position<FromFrame>, double>(segment,
                                                 {λ, 1.0 - λ});
     if (first_is_visible) {
-      return std::make_optional<Segment<FromFrame>>(
-                 {segment.first, intercept});
+      return std::make_optional<Segment<FromFrame>>(segment.first, intercept);
     } else {
       CHECK(second_is_visible);
-      return std::make_optional<Segment<FromFrame>>(
-                 {intercept, segment.second});
+      return std::make_optional<Segment<FromFrame>>(intercept, segment.second);
     }
   }
 }
diff --git a/include_solution.props b/include_solution.props
index 91a24ceeb5..f96f74f177 100644
--- a/include_solution.props
+++ b/include_solution.props
@@ -9,7 +9,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir).;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SOLUTION_DIR=std::experimental::filesystem::path(R"literal($(SolutionDir))literal");TEMP_DIR=std::experimental::filesystem::path(R"literal($(SolutionDir)temp\$(Configuration)\$(Platform)\)literal");%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SOLUTION_DIR=std::filesystem::path(R"literal($(SolutionDir))literal");TEMP_DIR=std::filesystem::path(R"literal($(SolutionDir)temp\$(Configuration)\$(Platform)\)literal");%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/ksp_plugin_test/plugin_compatibility_test.cpp b/ksp_plugin_test/plugin_compatibility_test.cpp
index 39b7d0eba7..c2cf067387 100644
--- a/ksp_plugin_test/plugin_compatibility_test.cpp
+++ b/ksp_plugin_test/plugin_compatibility_test.cpp
@@ -1,4 +1,5 @@
 
+#include <filesystem>
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/mathematica/local_error_analysis.cpp b/mathematica/local_error_analysis.cpp
index 236691d206..f911b48c3e 100644
--- a/mathematica/local_error_analysis.cpp
+++ b/mathematica/local_error_analysis.cpp
@@ -46,7 +46,7 @@ LocalErrorAnalyser::LocalErrorAnalyser(
 }
 
 void LocalErrorAnalyser::WriteLocalErrors(
-    std::path const& path,
+    std::filesystem::path const& path,
     FixedStepSizeIntegrator<
         Ephemeris<ICRFJ2000Equator>::NewtonianMotionEquation> const&
         fine_integrator,
diff --git a/testing_utilities/solar_system_factory_test.cpp b/testing_utilities/solar_system_factory_test.cpp
index 4195434bd5..eaae6ecda0 100644
--- a/testing_utilities/solar_system_factory_test.cpp
+++ b/testing_utilities/solar_system_factory_test.cpp
@@ -76,10 +76,11 @@ class SolarSystemFactoryTest : public testing::Test {
       DegreesOfFreedom<ICRFJ2000Equator> const& tertiary_dof,
       MassiveBody const& secondary_body,
       DegreesOfFreedom<ICRFJ2000Equator> const& secondary_dof,
-      std::optional<MassiveBody const&> const& primary_body,
-      std::optional<
-          DegreesOfFreedom<ICRFJ2000Equator> const&> const primary_dof,
-      std::string message) {
+      std::optional<std::reference_wrapper<MassiveBody const>> const&
+          primary_body,
+      std::optional <std::reference_wrapper<
+          DegreesOfFreedom<ICRFJ2000Equator> const>> const& primary_dof,
+      std::string const& message) {
     RelativeDegreesOfFreedom<ICRFJ2000Equator> const tertiary_secondary =
         tertiary_dof - secondary_dof;
     KeplerOrbit<ICRFJ2000Equator> orbit{
@@ -112,15 +113,15 @@ class SolarSystemFactoryTest : public testing::Test {
       DegreesOfFreedom<ICRFJ2000Equator> const& tertiary_dof,
       MassiveBody const& secondary_body,
       DegreesOfFreedom<ICRFJ2000Equator> const& secondary_dof,
-      std::string message) {
+      std::string const& message) {
     TestStronglyBoundOrbit(excentricity,
                            relative_error,
                            tertiary_body,
                            tertiary_dof,
                            secondary_body,
                            secondary_dof,
-                           /*tertiary_body=*/std::nullopt,
-                           /*tertiary=*/std::nullopt,
+                           /*primary_body=*/std::nullopt,
+                           /*primary_dof=*/std::nullopt,
                            message);
   }