File tree 3 files changed +7
-41
lines changed 3 files changed +7
-41
lines changed Original file line number Diff line number Diff line change @@ -502,6 +502,13 @@ jobs:
502
502
503
503
conan config init
504
504
yq eval '.compiler.clang.version += ["18"]' -i "$HOME/.conan/settings.yml"
505
+ - name : Add Apple-clang 16 to list of Conan compilers # workaround for the issue that Conan 1.x doesn't know about Apple-clang 16
506
+ if : ${{ matrix.ENABLE_CONAN == 'ON' && matrix.runs-on == 'macos-14' }}
507
+ run : |
508
+ sudo wget https://github.com/mikefarah/yq/releases/download/v4.9.6/yq_darwin_arm64 -O /usr/local/bin/yq && sudo chmod +x /usr/local/bin/yq
509
+
510
+ conan config init
511
+ yq eval '.compiler.apple-clang.version += ["16.0"]' -i "$HOME/.conan/settings.yml"
505
512
- name : Prepare build
506
513
run : |
507
514
mkdir ${OSRM_BUILD_DIR}
Original file line number Diff line number Diff line change @@ -11,46 +11,6 @@ namespace osrm::util
11
11
namespace bearing
12
12
{
13
13
14
- inline std::string get (const double heading)
15
- {
16
- BOOST_ASSERT (heading >= 0 );
17
- BOOST_ASSERT (heading <= 360 );
18
-
19
- if (heading <= 22.5 )
20
- {
21
- return " N" ;
22
- }
23
- if (heading <= 67.5 )
24
- {
25
- return " NE" ;
26
- }
27
- if (heading <= 112.5 )
28
- {
29
- return " E" ;
30
- }
31
- if (heading <= 157.5 )
32
- {
33
- return " SE" ;
34
- }
35
- if (heading <= 202.5 )
36
- {
37
- return " S" ;
38
- }
39
- if (heading <= 247.5 )
40
- {
41
- return " SW" ;
42
- }
43
- if (heading <= 292.5 )
44
- {
45
- return " W" ;
46
- }
47
- if (heading <= 337.5 )
48
- {
49
- return " NW" ;
50
- }
51
- return " N" ;
52
- }
53
-
54
14
// Checks whether A is between B-range and B+range, all modulo 360
55
15
// e.g. A = 5, B = 5, range = 10 == true
56
16
// A = -6, B = 5, range = 10 == false
Original file line number Diff line number Diff line change @@ -17,7 +17,6 @@ const static std::string IO_TOO_SMALL_FILE = "file_too_small_test_io.tmp";
17
17
const static std::string IO_CORRUPT_FINGERPRINT_FILE = " corrupt_fingerprint_file_test_io.tmp" ;
18
18
const static std::string IO_INCOMPATIBLE_FINGERPRINT_FILE =
19
19
" incompatible_fingerprint_file_test_io.tmp" ;
20
- const static std::string IO_TEXT_FILE = " plain_text_file.tmp" ;
21
20
22
21
using namespace osrm ;
23
22
You can’t perform that action at this time.
0 commit comments