Merge pull request #2080 from pleroy/Linux

Fix a link error found on Linux
mockingbirdnest · Feb 17, 2019 · 60d9122 · 60d9122
2 parents cfb60a6 + c3e2680
commit 60d9122
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/physics/ephemeris_body.hpp b/physics/ephemeris_body.hpp
@@ -72,7 +72,9 @@ constexpr Time max_time_between_checkpoints = 180 * Day;
 // downsampling from going postal.
 constexpr double mean_radius_tolerance = 0.9;
 
-Status const CollisionDetected(Error::OUT_OF_RANGE, "Collision detected");
+inline Status const CollisionDetected() {
+  return Status(Error::OUT_OF_RANGE, "Collision detected");
+}
 
 template<typename Frame>
 template<typename ODE>
@@ -425,7 +427,7 @@ Ephemeris<Frame>::NewInstance(
         accelerations[i] += intrinsic_acceleration(t);
       }
     }
-    return ok ? Status::OK : CollisionDetected;
+    return ok ? Status::OK : CollisionDetected();
   };
 
   CHECK(!trajectories.empty());
@@ -471,7 +473,7 @@ Status Ephemeris<Frame>::FlowWithAdaptiveStep(
     if (intrinsic_acceleration != nullptr) {
       accelerations[0] += intrinsic_acceleration(t);
     }
-    return ok ? Status::OK : CollisionDetected;
+    return ok ? Status::OK : CollisionDetected();
   };
 
   return FlowODEWithAdaptiveStep<NewtonianMotionEquation>(
@@ -505,7 +507,7 @@ Status Ephemeris<Frame>::FlowWithAdaptiveStep(
           accelerations[0] +=
               intrinsic_acceleration(t, {positions[0], velocities[0]});
         }
-        return ok ? Status::OK : CollisionDetected;
+        return ok ? Status::OK : CollisionDetected();
       };
 
   return FlowODEWithAdaptiveStep<GeneralizedNewtonianMotionEquation>(

diff --git a/testing_utilities/testing_utilities.vcxproj b/testing_utilities/testing_utilities.vcxproj
@@ -34,7 +34,6 @@
     <ClInclude Include="vanishes_before_body.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\base\status.cpp" />
     <ClCompile Include="..\numerics\cbrt.cpp" />
     <ClCompile Include="algebra_test.cpp" />
     <ClCompile Include="almost_equals_test.cpp" />

diff --git a/testing_utilities/testing_utilities.vcxproj.filters b/testing_utilities/testing_utilities.vcxproj.filters
@@ -115,8 +115,5 @@
     <ClCompile Include="..\numerics\cbrt.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\base\status.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/tools/tools.vcxproj b/tools/tools.vcxproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
   <Import Project="$(SolutionDir)principia.props" />
   <ItemGroup>
-    <ClCompile Include="..\base\status.cpp" />
     <ClCompile Include="..\numerics\cbrt.cpp" />
     <ClCompile Include="generate_configuration.cpp" />
     <ClCompile Include="generate_kopernicus.cpp" />

diff --git a/tools/tools.vcxproj.filters b/tools/tools.vcxproj.filters
@@ -27,9 +27,6 @@
     <ClCompile Include="generate_kopernicus.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\base\status.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="generate_configuration.hpp">