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: 0004393de958
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 207ddac223ae
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 16, 2017

  1. clangify

    @eggrobin
    eggrobin committed Mar 16, 2017
    Copy the full SHA
    e718580 View commit details

  2. -lsupc++, thanks @whitequark

    @eggrobin
    eggrobin committed Mar 16, 2017
    Copy the full SHA
    77d97de View commit details

  3. Merge remote-tracking branch 'la-vache/master' into clangify-cardano

    @eggrobin
    eggrobin committed Mar 16, 2017
    Copy the full SHA
    4cee0d2 View commit details

  4. after pleroy's review

    @eggrobin
    eggrobin committed Mar 16, 2017
    Copy the full SHA
    3c18f81 View commit details

  5. Merge pull request #1269 from eggrobin/clangify-cardano 

    Clangify for Cardano
    @pleroy
    pleroy authored Mar 16, 2017
    Copy the full SHA
    207ddac View commit details
Showing with 5 additions and 4 deletions.
  1. +3 −2 Makefile
  2. +1 −1 ksp_plugin/pile_up.hpp
  3. +1 −1 ksp_plugin/vessel.hpp
5 changes: 3 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -50,7 +50,8 @@ ADAPTER := $(ADAPTER_BUILD_DIR)$(ADAPTER_CONFIGURATION)/ksp_plugin
PLUGIN_DIRECTORY := $(FINAL_PRODUCTS_DIR)GameData/Principia/Linux64/

TEST_LIBS := $(DEP_DIR)benchmark/src/libbenchmark.a
LIBS := $(DEP_DIR)/protobuf/src/.libs/libprotobuf.a $(DEP_DIR)/glog/.libs/libglog.a -lpthread -lc++ -lc++abi
LIBS := $(DEP_DIR)/protobuf/src/.libs/libprotobuf.a \
$(DEP_DIR)/glog/.libs/libglog.a -lpthread -lc++ -lc++abi -lsupc++
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
@@ -207,7 +208,7 @@ $(PLUGIN_INDEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_INDEPENDENT_TEST_BINS) : $(GMOC

$(PRINCIPIA_TEST_BIN) $(PLUGIN_DEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_DEPENDENT_TEST_BINS) : $(MOCK_OBJECTS) $(GMOCK_OBJECTS) $(KSP_PLUGIN)
@mkdir -p $(@D)
$(CXX) $(LDFLAGS) $^ $(TEST_LIBS) -lpthread -o $@
$(CXX) $(LDFLAGS) $^ $(TEST_LIBS) -lpthread -lsupc++ -o $@

########## Testing

2 changes: 1 addition & 1 deletion ksp_plugin/pile_up.hpp
View file
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ class PileUp {

private:
// For deserialization.
explicit PileUp::PileUp(std::list<not_null<Part*>>&& parts);
explicit PileUp(std::list<not_null<Part*>>&& parts);

void AppendToPartTails(DiscreteTrajectory<Barycentric>::Iterator it,
bool authoritative) const;
2 changes: 1 addition & 1 deletion ksp_plugin/vessel.hpp
View file
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ class Vessel {

virtual DiscreteTrajectory<Barycentric> const& prediction() const;

virtual void Vessel::set_prediction_adaptive_step_parameters(
virtual void set_prediction_adaptive_step_parameters(
Ephemeris<Barycentric>::AdaptiveStepParameters const&
prediction_adaptive_step_parameters);
virtual Ephemeris<Barycentric>::AdaptiveStepParameters const&