Skip to content

Commit

Permalink
Fix compilation issues in stretch docker with gcc-6.3 (sonic-net#426)
Browse files Browse the repository at this point in the history
stepanblyschak authored and kcudnik committed Feb 22, 2019
1 parent 9609d46 commit da35224
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion SAI
4 changes: 2 additions & 2 deletions syncd/syncd_applyview.cpp
Original file line number Diff line number Diff line change
@@ -2615,7 +2615,7 @@ std::shared_ptr<SaiObj> findCurrentBestMatchForNextHopGroup(
SWSS_LOG_NOTICE("failed to find route candidate for NHG: %s",
temporaryObj->str_object_id.c_str());

return false;
return nullptr;
}

/*
@@ -6840,7 +6840,7 @@ void logViewObjectCount(
}

void checkAsicVsDatabaseConsistency(
_In_ const AsicView cur,
_In_ const AsicView &cur,
_In_ const AsicView &tmp)
{
SWSS_LOG_ENTER();

0 comments on commit da35224

Please sign in to comment.