mockingbirdnest · Mar 31, 2018 · Mar 31, 2018 · Mar 31, 2018 · Apr 1, 2018 · Apr 1, 2018
diff --git a/Makefile b/Makefile
@@ -65,14 +65,14 @@ LIBS          := $(DEP_DIR)/protobuf/src/.libs/libprotobuf.a \
 TEST_INCLUDES := \
 	-I$(DEP_DIR)googletest/googlemock/include -I$(DEP_DIR)googletest/googletest/include \
 	-I$(DEP_DIR)googletest/googlemock/ -I$(DEP_DIR)googletest/googletest/ -I$(DEP_DIR)benchmark/include
-INCLUDES      := -I. -I$(DEP_DIR)glog/src -I$(DEP_DIR)protobuf/src -I$(DEP_DIR)Optional -I$(DEP_DIR)eggsperimental_filesystem/
+INCLUDES      := -I. -I$(DEP_DIR)glog/src -I$(DEP_DIR)protobuf/src -I$(DEP_DIR)compatibility/filesystem
 SHARED_ARGS   := \
-	-std=c++1z -stdlib=libc++ -O3 -g                                        \
-	-fPIC -fexceptions -ferror-limit=1 -fno-omit-frame-pointer              \
-	-Wall -Wpedantic                                                        \
-	-DPROJECT_DIR='std::experimental::filesystem::path("$(PROJECT_DIR)")'   \
-	-DSOLUTION_DIR='std::experimental::filesystem::path("$(SOLUTION_DIR)")' \
-	-DTEMP_DIR='std::experimental::filesystem::path("/tmp")'                \
+	-std=c++1z -stdlib=libc++ -O3 -g                           \
+	-fPIC -fexceptions -ferror-limit=1 -fno-omit-frame-pointer \
+	-Wall -Wpedantic                                           \
+	-DPROJECT_DIR='std::filesystem::path("$(PROJECT_DIR)")'    \
+	-DSOLUTION_DIR='std::filesystem::path("$(SOLUTION_DIR)")'  \
+	-DTEMP_DIR='std::filesystem::path("/tmp")'                 \
 	-DNDEBUG
 
 ifeq ($(UNAME_S),Linux)
@@ -87,6 +87,7 @@ ifeq ($(UNAME_S),Linux)
     SHAREDFLAG := -shared
 endif
 ifeq ($(UNAME_S),Darwin)
+    INCLUDES += -I$(DEP_DIR)compatibility/optional -I$(DEP_DIR)Optional
     SHARED_ARGS += -mmacosx-version-min=10.11 -arch x86_64
     MDTOOL ?= "/Applications/Xamarin Studio.app/Contents/MacOS/mdtool"
     SHAREDFLAG := -dynamiclib

diff --git a/astronomy/ksp_fingerprint_test.cpp b/astronomy/ksp_fingerprint_test.cpp
@@ -1,4 +1,4 @@
-#include <experimental/filesystem>
+
 #include <string>
 
 #include "astronomy/solar_system_fingerprints.hpp"

diff --git a/astronomy/ksp_resonance_test.cpp b/astronomy/ksp_resonance_test.cpp
@@ -1,6 +1,5 @@
 
 #include <algorithm>
-#include <experimental/filesystem>
 #include <map>
 #include <string>
 #include <vector>

diff --git a/astronomy/ksp_system_test.cpp b/astronomy/ksp_system_test.cpp
@@ -1,7 +1,6 @@
 
 #include <algorithm>
 #include <chrono>
-#include <experimental/filesystem>
 #include <fstream>
 #include <map>
 #include <string>

diff --git a/astronomy/solar_system_dynamics_test.cpp b/astronomy/solar_system_dynamics_test.cpp
@@ -1,7 +1,6 @@
 
 #include <algorithm>
-#include <experimental/filesystem>
-#include <experimental/optional>
+#include <optional>
 #include <map>
 #include <string>
 #include <tuple>
@@ -92,10 +91,8 @@ class SolarSystemDynamicsTest : public testing::Test {
   struct OrbitError final {
     Angle separation_per_orbit;
     Angle inclination_drift_per_orbit;
-    std::experimental::optional<Angle>
-        longitude_of_ascending_node_drift_per_orbit;
-    std::experimental::optional<Angle>
-        argument_of_periapsis_drift_per_orbit;
+    std::optional<Angle> longitude_of_ascending_node_drift_per_orbit;
+    std::optional<Angle> argument_of_periapsis_drift_per_orbit;
   };
 
   SolarSystemDynamicsTest() {
@@ -166,8 +163,7 @@ class SolarSystemDynamicsTest : public testing::Test {
     enum LocalFrameTag { tag };
     using ParentEquator = Frame<LocalFrameTag, tag, /*frame_is_inertial=*/true>;
     auto const z = Bivector<double, ICRFJ2000Equator>({0, 0, 1});
-    std::experimental::optional<Rotation<ICRFJ2000Equator, ParentEquator>>
-        rotation;
+    std::optional<Rotation<ICRFJ2000Equator, ParentEquator>> rotation;
 
     if (SolarSystemFactory::parent(index) == SolarSystemFactory::Sun) {
       Bivector<AngularMomentum, ICRFJ2000Equator>

diff --git a/astronomy/молния_orbit_test.cpp b/astronomy/молния_orbit_test.cpp
@@ -1,5 +1,5 @@
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include <vector>
 
 #include "astronomy/epoch.hpp"

diff --git a/base/bundle.hpp b/base/bundle.hpp
@@ -1,11 +1,11 @@
 
 #pragma once
 
-#include <experimental/optional>
 #include <functional>
 #include <queue>
 #include <memory>
 #include <mutex>
+#include <optional>
 #include <shared_mutex>
 #include <vector>
 
@@ -77,7 +77,7 @@ class Bundle final {
   // workers will terminate without considering queued tasks.  Set by |Abort|,
   // accessed by |Aborting|, returned by |Join|.
   Status status_ GUARDED_BY(status_lock_);
-  std::experimental::optional<std::chrono::steady_clock::time_point> deadline_
+  std::optional<std::chrono::steady_clock::time_point> deadline_
       GUARDED_BY(status_lock_);
 
   // Whether the workers should terminate when no tasks are available.  Set by

diff --git a/base/disjoint_sets.hpp b/base/disjoint_sets.hpp
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include <experimental/optional>
+#include <optional>
 #include <list>
 
 #include "base/not_null.hpp"
@@ -61,7 +61,7 @@ class Subset final {
     int rank_ = 0;
 
     // Do not require a default constructor for |Properties|.
-    std::experimental::optional<Properties> properties_;
+    std::optional<Properties> properties_;
 
     friend class Subset<T>;
   };

diff --git a/base/file.hpp b/base/file.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include <fstream>
 #include <string>
 
@@ -12,7 +12,7 @@ namespace internal_file {
 class OFStream {
  public:
   OFStream();
-  explicit OFStream(std::experimental::filesystem::path const& path);
+  explicit OFStream(std::filesystem::path const& path);
   ~OFStream();
 
   OFStream& operator=(OFStream&& other);

diff --git a/base/file_body.hpp b/base/file_body.hpp
@@ -2,26 +2,40 @@
 
 #include "base/file.hpp"
 
+#include <filesystem>
 #include <string>
 
 #include "base/macros.hpp"
 #include "glog/logging.h"
 
+// In 15.7.0 preview 2 <filesystem> is not yet up to speed compared to
+// <experimental/filesystem>.
+#if PRINCIPIA_COMPILER_MSVC && _MSC_FULL_VER <= 191426316
+#include <experimental/filesystem>
+#endif
+
 namespace principia {
 namespace base {
 namespace internal_file {
 
 inline OFStream::OFStream() {}
 
-inline OFStream::OFStream(std::experimental::filesystem::path const& path) {
+inline OFStream::OFStream(std::filesystem::path const& path) {
 #if PRINCIPIA_COMPILER_MSVC
   CHECK(path.has_filename()) << path;
-  std::experimental::filesystem::path directory = path;
+  std::filesystem::path directory = path;
   directory.remove_filename();
-  if (!std::experimental::filesystem::exists(directory)) {
-    CHECK(std::experimental::filesystem::create_directories(directory))
+#if _MSC_FULL_VER <= 191426316
+  if (!std::experimental::filesystem::exists(directory.native())) {
+    CHECK(std::experimental::filesystem::create_directories(directory.native()))
         << directory;
   }
+#else
+  if (!std::filesystem::exists(directory)) {
+    CHECK(std::filesystem::create_directories(directory))
+        << directory;
+  }
+#endif
 #endif
   stream_.open(path);
   CHECK(stream_.good()) << path;

diff --git a/base/optional_logging.hpp b/base/optional_logging.hpp
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include <experimental/optional>
+#include <optional>
 
 // We need to pollute the |::| namespace in order for lookup to work, like
 // glog/stl_logging.h.  The following caveat from glog/stl_logging.h applies
@@ -19,6 +19,6 @@
 // If |optional|, logs |*optional|, otherwise, logs |"nullopt"|.
 template<typename T>
 std::ostream& operator<<(std::ostream& out,
-                         std::experimental::optional<T> const& optional);
+                         std::optional<T> const& optional);
 
 #include "base/optional_logging_body.hpp"
diff --git a/base/optional_logging_body.hpp b/base/optional_logging_body.hpp
@@ -1,9 +1,11 @@
 
 #pragma once
 
+#include "base/optional_logging.hpp"
+
 template<typename T>
 std::ostream& operator<<(std::ostream& out,
-                         std::experimental::optional<T> const& optional) {
+                         std::optional<T> const& optional) {
   if (optional) {
     return out << *optional;
   } else {

diff --git a/base/optional_serialization.hpp b/base/optional_serialization.hpp
@@ -1,7 +1,6 @@
 
 #pragma once
 
-#include <experimental/optional>
 #include <functional>
 #include <type_traits>
 

diff --git a/base/status_or.hpp b/base/status_or.hpp
@@ -86,8 +86,8 @@
 //  }
 //
 
-#include <experimental/optional>
 #include <new>
+#include <optional>
 #include <string>
 #include <utility>
 
@@ -145,7 +145,7 @@ class StatusOr final {
 
  private:
   Status status_;
-  std::experimental::optional<T> value_;
+  std::optional<T> value_;
 
   template<typename U>
   friend class StatusOr;

diff --git a/benchmarks/dynamic_frame.cpp b/benchmarks/dynamic_frame.cpp
@@ -1,7 +1,6 @@
 
 // .\Release\x64\benchmarks.exe --benchmark_filter=DynamicFrame --benchmark_repetitions=5  // NOLINT(whitespace/line_length)
 
-#include <experimental/optional>
 #include <memory>
 #include <utility>
 #include <vector>

diff --git a/geometry/perspective.hpp b/geometry/perspective.hpp
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include <experimental/optional>
+#include <optional>
 #include <utility>
 #include <vector>
 
@@ -50,7 +50,7 @@ class Perspective final {
   // Returns the part of |segment| that is behind the focal plane as seen from
   // the camera.  Returns nullopt if |segment| is entirely in front of the focal
   // plane.
-  std::experimental::optional<Segment<FromFrame>>
+  std::optional<Segment<FromFrame>>
   SegmentBehindFocalPlane(Segment<FromFrame> const& segment) const;
 
   // The square of the tangent of the angular distance between the given points

diff --git a/geometry/perspective_body.hpp b/geometry/perspective_body.hpp
@@ -60,7 +60,7 @@ operator()(Position<FromFrame> const& point) const {
 }
 
 template<typename FromFrame, typename ToFrame>
-std::experimental::optional<Segment<FromFrame>>
+std::optional<Segment<FromFrame>>
 Perspective<FromFrame, ToFrame>::SegmentBehindFocalPlane(
     Segment<FromFrame> const& segment) const {
   Vector<double, FromFrame> const z =
@@ -72,20 +72,18 @@ Perspective<FromFrame, ToFrame>::SegmentBehindFocalPlane(
   if (first_is_visible && second_is_visible) {
     return segment;
   } else if (!first_is_visible && !second_is_visible) {
-    return std::experimental::nullopt;
+    return std::nullopt;
   } else {
     // λ determines where the segment intersects the focal plane.
     double const λ = (focal_ - z2) / (z1 - z2);
     auto const intercept =
         Barycentre<Position<FromFrame>, double>(segment,
                                                 {λ, 1.0 - λ});
     if (first_is_visible) {
-      return std::experimental::make_optional<Segment<FromFrame>>(
-                 {segment.first, intercept});
+      return std::make_optional<Segment<FromFrame>>(segment.first, intercept);
     } else {
       CHECK(second_is_visible);
-      return std::experimental::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
@@ -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/install_deps.sh b/install_deps.sh
@@ -71,21 +71,20 @@ git checkout master
 git pull
 popd
 
-if [ ! -d "eggsperimental_filesystem" ]; then
-  git clone "https://github.com/Norgg/eggsperimental_filesystem.git"
+if [ ! -d "compatibility" ]; then
+  git clone "https://github.com/mockingbirdnest/compatibility"
 fi
-pushd eggsperimental_filesystem
+pushd compatibility
 git checkout master
 git pull
 popd
 
-# Optional doesn't need to be compiled either
 if [ ! -d "Optional" ]; then
-  git clone "https://github.com/mockingbirdnest/Optional.git"
+  mkdir Optional
 fi
 pushd Optional
-git checkout master
-git pull
+curl "https://raw.githubusercontent.com/llvm-mirror/libcxx/52f9ca28a39aa02a2e78fa0eb5aa927ad046487f/include/optional" > principia_optional_impl
+touch __undef_macros
 popd
 
 # TODO(egg): This probably needs to be compiled

diff --git a/integrators/embedded_explicit_runge_kutta_nyström_integrator_body.hpp b/integrators/embedded_explicit_runge_kutta_nyström_integrator_body.hpp
@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <cmath>
 #include <ctime>
-#include <experimental/optional>
+#include <optional>
 #include <vector>
 
 #include "geometry/sign.hpp"
@@ -65,7 +65,7 @@ Instance::Solve(Instant const& t_final) {
   // restartability.
 
   // State before the last, truncated step.
-  std::experimental::optional<typename ODE::SystemState> final_state;
+  std::optional<typename ODE::SystemState> final_state;
 
   // Argument checks.
   int const dimension = current_state.positions.size();

diff --git a/integrators/integrators.hpp b/integrators/integrators.hpp
@@ -1,7 +1,6 @@
 #ifndef PRINCIPIA_INTEGRATORS_INTEGRATORS_HPP_
 #define PRINCIPIA_INTEGRATORS_INTEGRATORS_HPP_
 
-#include <experimental/optional>
 #include <functional>
 #include <string>
 

diff --git a/integrators/symmetric_linear_multistep_integrator_test.cpp b/integrators/symmetric_linear_multistep_integrator_test.cpp
@@ -2,6 +2,7 @@
 #include "integrators/symmetric_linear_multistep_integrator.hpp"
 
 #include <algorithm>
+#include <filesystem>
 #include <vector>
 #include <string>
 
@@ -271,7 +272,7 @@ TEST_P(SymmetricLinearMultistepIntegratorTest, Convergence) {
   }
 
   {
-    std::experimental::filesystem::path filename;
+    std::filesystem::path filename;
     filename += "convergence.";
     filename += GetParam().name;
     filename += ".generated.wl";