Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a75e9890aa89
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 15e157e99c6e
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 24, 2019

  1. Missing this.

    pleroy committed Mar 24, 2019
    Copy the full SHA
    ced29d0 View commit details
  2. Copy the full SHA
    9923c51 View commit details
  3. More fixes.

    pleroy committed Mar 24, 2019
    Copy the full SHA
    53e92c8 View commit details

Commits on Mar 25, 2019

  1. Merge pull request #2109 from pleroy/Linux

    Changes to compile on Linux
    pleroy authored Mar 25, 2019
    Copy the full SHA
    15e157e View commit details
Showing with 9 additions and 7 deletions.
  1. +6 −4 Makefile
  2. +2 −2 physics/continuous_trajectory_test.cpp
  3. +1 −1 physics/discrete_trajectory_body.hpp
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -18,8 +18,9 @@ TEST_TRANSLATION_UNITS := $(wildcard */*_test.cpp)
TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS := $(TEST_TRANSLATION_UNITS) $(FAKE_OR_MOCK_TRANSLATION_UNITS)
TOOLS_TRANSLATION_UNITS := $(wildcard tools/*.cpp)
LIBRARY_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS) $(BENCHMARK_TRANSLATION_UNITS), $(wildcard */*.cpp))
JOURNAL_LIB_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS), $(wildcard journal/*.cpp))
ASTRONOMY_LIB_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS), $(wildcard astronomy/*.cpp))
BASE_LIB_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS), $(wildcard base/*.cpp))
JOURNAL_LIB_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS), $(wildcard journal/*.cpp))
NUMERICS_LIB_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS), $(wildcard numerics/*.cpp))
PROTO_FILES := $(wildcard */*.proto)
PROTO_TRANSLATION_UNITS := $(PROTO_FILES:.proto=.pb.cc)
@@ -166,9 +167,10 @@ GMOCK_MAIN_OBJECT := $(addprefix $(OBJ_DIRECTORY), $(GMOCK_MAIN_TRANS
BENCHMARK_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(BENCHMARK_TRANSLATION_UNITS:.cpp=.o))
TOOLS_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(TOOLS_TRANSLATION_UNITS:.cpp=.o))
PLUGIN_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(PLUGIN_TRANSLATION_UNITS:.cpp=.o))
JOURNAL_LIB_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(JOURNAL_LIB_TRANSLATION_UNITS:.cpp=.o))
VERSION_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(VERSION_TRANSLATION_UNIT:.cc=.o))
ASTRONOMY_LIB_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(ASTRONOMY_LIB_TRANSLATION_UNITS:.cpp=.o)) $(VERSION_OBJECTS)
BASE_LIB_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(BASE_LIB_TRANSLATION_UNITS:.cpp=.o)) $(VERSION_OBJECTS)
JOURNAL_LIB_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(JOURNAL_LIB_TRANSLATION_UNITS:.cpp=.o))
NUMERICS_LIB_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(NUMERICS_LIB_TRANSLATION_UNITS:.cpp=.o)) $(VERSION_OBJECTS)
TEST_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(TEST_TRANSLATION_UNITS:.cpp=.o))
FAKE_OR_MOCK_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(FAKE_OR_MOCK_TRANSLATION_UNITS:.cpp=.o))
@@ -227,7 +229,7 @@ $(TEST_BINS) : $(BIN_DIRECTORY)% : $(OBJ_DIRECTORY)%.o
$(PACKAGE_TEST_BINS) : $(BIN_DIRECTORY)%test : $$(filter $(OBJ_DIRECTORY)%$$(PERCENT), $(TEST_OBJECTS))
$(PRINCIPIA_TEST_BIN) : $(TEST_OBJECTS)

$(PLUGIN_INDEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_INDEPENDENT_TEST_BINS) : $(GMOCK_OBJECTS) $(GMOCK_MAIN_OBJECT) $(PROTO_OBJECTS) $(BASE_LIB_OBJECTS) $(NUMERICS_LIB_OBJECTS)
$(PLUGIN_INDEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_INDEPENDENT_TEST_BINS) : $(GMOCK_OBJECTS) $(GMOCK_MAIN_OBJECT) $(PROTO_OBJECTS) $(ASTRONOMY_LIB_OBJECTS) $(BASE_LIB_OBJECTS) $(NUMERICS_LIB_OBJECTS)
@mkdir -p $(@D)
$(CXX) $(LDFLAGS) $^ $(LIBS) -o $@

@@ -236,7 +238,7 @@ $(PLUGIN_INDEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_INDEPENDENT_TEST_BINS) : $(GMOC
# NOTE(egg): this assumes that only the plugin-dependent tests need to be linked
# against mock objects. The classes further up that are big enough to be mocked
# are likely to be highly templatized, so this will probably hold for a while.
$(PRINCIPIA_TEST_BIN) $(PLUGIN_DEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_DEPENDENT_TEST_BINS) : $(FAKE_OR_MOCK_OBJECTS) $(GMOCK_OBJECTS) $(GMOCK_MAIN_OBJECT) $(KSP_PLUGIN) $(BASE_LIB_OBJECTS) $(NUMERICS_LIB_OBJECTS)
$(PRINCIPIA_TEST_BIN) $(PLUGIN_DEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_DEPENDENT_TEST_BINS) : $(FAKE_OR_MOCK_OBJECTS) $(GMOCK_OBJECTS) $(GMOCK_MAIN_OBJECT) $(KSP_PLUGIN) $(ASTRONOMY_LIB_OBJECTS) $(BASE_LIB_OBJECTS) $(NUMERICS_LIB_OBJECTS)
@mkdir -p $(@D)
$(CXX) $(LDFLAGS) $^ $(TEST_LIBS) $(LIBS) -lpthread -o $@

4 changes: 2 additions & 2 deletions physics/continuous_trajectory_test.cpp
Original file line number Diff line number Diff line change
@@ -123,8 +123,8 @@ TestableContinuousTrajectory<Frame>::LockAndComputeBestNewhallApproximation(
Instant const& time,
std::vector<Displacement<Frame>> const& q,
std::vector<Velocity<Frame>> const& v) {
absl::MutexLock l(&lock_);
return ComputeBestNewhallApproximation(time, q, v);
absl::MutexLock l(&this->lock_);
return this->ComputeBestNewhallApproximation(time, q, v);
}

template<typename Frame>
2 changes: 1 addition & 1 deletion physics/discrete_trajectory_body.hpp
Original file line number Diff line number Diff line change
@@ -108,7 +108,7 @@ template<typename Frame>
void DiscreteTrajectory<Frame>::AttachFork(
not_null<std::unique_ptr<DiscreteTrajectory<Frame>>> fork) {
CHECK(fork->is_root());
CHECK(!Empty());
CHECK(!this->Empty());

auto& fork_timeline = fork->timeline_;
auto const this_last = last();