rebase branch onto develop

This commit is contained in:
Dennis Luxen
2014-04-24 18:13:50 +02:00
parent ace59411cb
commit 0eed39cdf1
8 changed files with 51 additions and 156 deletions
+2 -2
View File
@@ -91,7 +91,7 @@ public:
void SetConfig(const DescriptorConfig & c) { config = c; }
int DescribeLeg(
const std::vector<PathData> & route_leg,
const std::vector<PathData> route_leg,
const PhantomNodes & leg_phantoms
) {
int added_element_count = 0;
@@ -451,7 +451,7 @@ public:
//Fetch data from Factory and generate a string from it.
BOOST_FOREACH(const SegmentInformation & segment, description_factory.pathDescription) {
TurnInstruction current_instruction = segment.turn_instruction & TurnInstructionsClass::InverseAccessRestrictionFlag;
TurnInstruction current_instruction = segment.turn_instruction & TurnInstructionsClass::InverseAccessRestrictionFlag;
entered_restricted_area_count += (current_instruction != segment.turn_instruction);
if (TurnInstructionsClass::TurnIsNecessary( current_instruction) )
{