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

Commits on Aug 29, 2021

  1. unify macros

    eggrobin committed Aug 29, 2021
    Copy the full SHA
    eb8249c View commit details
  2. Merge pull request #3121 from eggrobin/mac-encoding

    Unify macros
    eggrobin authored Aug 29, 2021
    Copy the full SHA
    412df29 View commit details
Showing with 5 additions and 10 deletions.
  1. +1 −1 astronomy/лидов_古在_test.cpp
  2. +2 −1 astronomy/молния_orbit_test.cpp
  3. +2 −8 base/macros.hpp
2 changes: 1 addition & 1 deletion astronomy/лидов_古在_test.cpp
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ TEST_F(Лидов古在Test, MercuryOrbiter) {
}
mathematica::Logger logger(
SOLUTION_DIR / "mathematica" /
PRINCIPIA_PATH_ENCODING("лидов_古在.generated.wl"),
PRINCIPIA_UNICODE_PATH("лидов_古在.generated.wl"),
/*make_unique=*/false);

DiscreteTrajectory<MercuryCentredInertial> mercury_centred_trajectory;
3 changes: 2 additions & 1 deletion astronomy/молния_orbit_test.cpp
Original file line number Diff line number Diff line change
@@ -136,7 +136,8 @@ TEST_F(МолнияOrbitTest, DISABLED_Satellite) {
}

mathematica::Logger logger(
SOLUTION_DIR / "mathematica" / UNICODE_PATH("молния_orbit.generated.wl"),
SOLUTION_DIR / "mathematica" /
PRINCIPIA_UNICODE_PATH("молния_orbit.generated.wl"),
/*make_unique=*/false);

std::vector<Angle> longitudes_of_ascending_nodes;
10 changes: 2 additions & 8 deletions base/macros.hpp
Original file line number Diff line number Diff line change
@@ -150,9 +150,9 @@ inline void noreturn() { std::exit(0); }

// Unicode.
#if OS_WIN
# define UNICODE_PATH(x) u ## x
# define PRINCIPIA_UNICODE_PATH(x) u ## x
#else
# define UNICODE_PATH(x) u8 ## x
# define PRINCIPIA_UNICODE_PATH(x) u8 ## x
#endif

#define NAMED(expression) u8 ## #expression << ": " << (expression)
@@ -241,11 +241,5 @@ template_and_result declared_name parameters; \
} \
using internal_##package_name::declared_name

#if OS_WIN
#define PRINCIPIA_PATH_ENCODING(string) u##string
#else
#define PRINCIPIA_PATH_ENCODING(string) u8##string
#endif

} // namespace base
} // namespace principia