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: fa680f53ddea
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: afba64d8c254
Choose a head ref
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Jan 4, 2019

  1. Fix problems found on Linux.

    pleroy committed Jan 4, 2019
    Copy the full SHA
    483fa42 View commit details
  2. After egg's review

    pleroy committed Jan 4, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    2e17ca0 View commit details
  3. Merge pull request #2055 from pleroy/Linux

    Fix problems found on Linux
    pleroy authored Jan 4, 2019
    Copy the full SHA
    afba64d View commit details
Showing with 3 additions and 160 deletions.
  1. +3 −5 Makefile
  2. +0 −53 base/arena_allocator.hpp
  3. +0 −46 base/arena_allocator_body.hpp
  4. +0 −44 base/arena_allocator_test.cpp
  5. +0 −3 base/base.vcxproj
  6. +0 −9 base/base.vcxproj.filters
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -61,6 +61,7 @@ endif
TEST_LIBS := $(DEP_DIR)benchmark/src/libbenchmark.a $(DEP_DIR)protobuf/src/.libs/libprotobuf.a
LIBS := $(DEP_DIR)protobuf/src/.libs/libprotobuf.a \
$(DEP_DIR)gipfeli/libgipfeli.a \
$(DEP_DIR)abseil-cpp/absl/strings/libabsl_strings.a \
$(DEP_DIR)abseil-cpp/absl/synchronization/libabsl_synchronization.a \
$(DEP_DIR)abseil-cpp/absl/time/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/debugging/libabsl_*.a \
@@ -231,16 +232,13 @@ $(PLUGIN_INDEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_INDEPENDENT_TEST_BINS) : $(GMOC
$(CXX) $(LDFLAGS) $^ $(LIBS) -o $@

# For tests that depend on the plugin, we link against the principia shared
# library instead of statically linking the objects. Also note that we do not
# link the $(LIBS), since they are in the $(KSP_PLUGIN). We still need pthread
# though.
# library instead of statically linking the objects.
# 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)
@mkdir -p $(@D)
$(CXX) $(LDFLAGS) $^ $(TEST_LIBS) -lpthread -o $@
$(CXX) $(LDFLAGS) $^ $(TEST_LIBS) $(LIBS) -lpthread -o $@

########## Testing

53 changes: 0 additions & 53 deletions base/arena_allocator.hpp

This file was deleted.

46 changes: 0 additions & 46 deletions base/arena_allocator_body.hpp

This file was deleted.

44 changes: 0 additions & 44 deletions base/arena_allocator_test.cpp

This file was deleted.

3 changes: 0 additions & 3 deletions base/base.vcxproj
Original file line number Diff line number Diff line change
@@ -20,8 +20,6 @@
<ClCompile />
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="arena_allocator.hpp" />
<ClInclude Include="arena_allocator_body.hpp" />
<ClInclude Include="array.hpp" />
<ClInclude Include="array_body.hpp" />
<ClInclude Include="base32768.hpp" />
@@ -76,7 +74,6 @@
<ClInclude Include="version.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="arena_allocator_test.cpp" />
<ClCompile Include="array_test.cpp" />
<ClCompile Include="base32768_test.cpp" />
<ClCompile Include="base64_test.cpp" />
9 changes: 0 additions & 9 deletions base/base.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -170,12 +170,6 @@
<ClInclude Include="graveyard_body.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="arena_allocator.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="arena_allocator_body.hpp">
<Filter>Source Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="not_null_test.cpp">
@@ -226,8 +220,5 @@
<ClCompile Include="base64_test.cpp">
<Filter>Test Files</Filter>
</ClCompile>
<ClCompile Include="arena_allocator_test.cpp">
<Filter>Test Files</Filter>
</ClCompile>
</ItemGroup>
</Project>