Make unit tests compile again after rebasing
This commit is contained in:
		
							parent
							
								
									f16a865420
								
							
						
					
					
						commit
						4bb7e734f9
					
				@ -11,6 +11,9 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <vector>
 | 
					#include <vector>
 | 
				
			||||||
#include <array>
 | 
					#include <array>
 | 
				
			||||||
 | 
					#include <string>
 | 
				
			||||||
 | 
					#include <utility>
 | 
				
			||||||
 | 
					#include <numeric>
 | 
				
			||||||
#include <algorithm>
 | 
					#include <algorithm>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace osrm
 | 
					namespace osrm
 | 
				
			||||||
 | 
				
			|||||||
@ -50,8 +50,7 @@ Hint Hint::FromBase64(const std::string &base64Hint)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
bool operator==(const Hint &lhs, const Hint &rhs)
 | 
					bool operator==(const Hint &lhs, const Hint &rhs)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    return std::tie(lhs.phantom, lhs.data_checksum) ==
 | 
					    return std::tie(lhs.phantom, lhs.data_checksum) == std::tie(rhs.phantom, rhs.data_checksum);
 | 
				
			||||||
           std::tie(rhs.phantom, rhs.data_checksum);
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
std::ostream &operator<<(std::ostream &out, const Hint &hint) { return out << hint.ToBase64(); }
 | 
					std::ostream &operator<<(std::ostream &out, const Hint &hint) { return out << hint.ToBase64(); }
 | 
				
			||||||
 | 
				
			|||||||
@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(hint_encoding_decoding_roundtrip)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    const Coordinate coordinate;
 | 
					    const Coordinate coordinate;
 | 
				
			||||||
    const PhantomNode phantom;
 | 
					    const PhantomNode phantom;
 | 
				
			||||||
    const osrm::test::MockDataFacade facade;
 | 
					    const osrm::test::MockDataFacade facade{};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    const Hint hint{coordinate, phantom, facade.GetCheckSum()};
 | 
					    const Hint hint{coordinate, phantom, facade.GetCheckSum()};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE(hint_encoding_decoding_roundtrip_bytewise)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    const Coordinate coordinate;
 | 
					    const Coordinate coordinate;
 | 
				
			||||||
    const PhantomNode phantom;
 | 
					    const PhantomNode phantom;
 | 
				
			||||||
    const osrm::test::MockDataFacade facade;
 | 
					    const osrm::test::MockDataFacade facade{};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    const Hint hint{coordinate, phantom, facade.GetCheckSum()};
 | 
					    const Hint hint{coordinate, phantom, facade.GetCheckSum()};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user