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

Commits on Jun 3, 2019

  1. It now works.

    pleroy committed Jun 3, 2019
    Copy the full SHA
    64e24e4 View commit details

Commits on Jun 5, 2019

  1. Merge pull request #2195 from pleroy/Base32768

    Base32768 now works
    pleroy authored Jun 5, 2019
    Copy the full SHA
    09426af View commit details
Showing with 5 additions and 21 deletions.
  1. +0 βˆ’13 base/base.vcxproj
  2. +1 βˆ’2 base/base32768_body.hpp
  3. +4 βˆ’6 base/base32768_test.cpp
13 changes: 0 additions & 13 deletions base/base.vcxproj
Original file line number Diff line number Diff line change
@@ -5,19 +5,6 @@
<RootNamespace>base</RootNamespace>
</PropertyGroup>
<Import Project="$(SolutionDir)principia.props" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalOptions>/w14061 /constexpr:steps200000 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions>/w14061 /constexpr:steps200000 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_LLVM|x64'">
<ClCompile />
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="array.hpp" />
<ClInclude Include="array_body.hpp" />
3 changes: 1 addition & 2 deletions base/base32768_body.hpp
Original file line number Diff line number Diff line change
@@ -161,8 +161,7 @@ constexpr auto fifteen_bits = MakeRepertoire<block_size>(
_MSC_FULL_VER == 191'627'024 || \
_MSC_FULL_VER == 191'627'025 || \
_MSC_FULL_VER == 191'627'027 || \
_MSC_FULL_VER == 192'027'508 || \
_MSC_FULL_VER == 192'227'706)
_MSC_FULL_VER == 192'027'508)
u"α–€α– α—€α— α˜€α˜ α™€αš α›€αž€α  α‘€α£€α¦€α§ α¨ α―€α°€α΄€β‡ β‹€β€β βŽ€βŽ β€β€β”€β” β•€β• β–€"
u"β– β—€β— β˜€β˜ β™€β™ βš€βš β›€β› βœ€βœ β€βž€βž β €β  β‘€β‘ β’€β’ β£€β£ β€€β€ β₯€β₯ β¦ β¨ β©€βͺ€"
u"βͺ β« β¬€β¬ β­€β°€β²€β² β³€β΄€β΅€βΊ β»€γ‡€γ€γ γ‘€γ‘ γ’€γ’ γ“€γ“ γ”€γ” γ•€γ• γ–€γ– γ—€γ— γ˜€γ˜ "
10 changes: 4 additions & 6 deletions base/base32768_test.cpp
Original file line number Diff line number Diff line change
@@ -84,8 +84,7 @@ using Base32768DeathTest = Base32768Test;
_MSC_FULL_VER == 191'627'024 || \
_MSC_FULL_VER == 191'627'025 || \
_MSC_FULL_VER == 191'627'027 || \
_MSC_FULL_VER == 192'027'508 || \
_MSC_FULL_VER == 192'227'706)
_MSC_FULL_VER == 192'027'508)
TEST_F(Base32768Test, EncodeMultipleOf15Bits) {
// First 15 bytes of the MD5 of the empty string.
Array<std::uint8_t const> const binary("\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04"
@@ -279,10 +278,9 @@ TEST_F(Base32768Test, Random) {
binary1.data[i] = bytes_distribution(random);
}

UniqueArray<char16_t> const base32768 =
Base32768Encode(binary1.get(),
/*null_terminated=*/false);
UniqueArray<std::uint8_t> binary2 = Base32768Decode(base32768.get());
Base32768Encoder</*null_terminated=*/false> encoder;
UniqueArray<char16_t> const base32768 = encoder.Encode(binary1.get());
UniqueArray<std::uint8_t> binary2 = encoder.Decode(base32768.get());

EXPECT_THAT(binary2.get(), EqualsBytes(binary1.get())) << "test: " << test;
}