Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make changes to support compiling on Bullseye with GCC 10 #2216

Merged
merged 1 commit into from
Apr 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cfgmgr/buffermgrdyn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ using namespace swss;
BufferMgrDynamic::BufferMgrDynamic(DBConnector *cfgDb, DBConnector *stateDb, DBConnector *applDb, const vector<TableConnector> &tables, shared_ptr<vector<KeyOpFieldsValuesTuple>> gearboxInfo, shared_ptr<vector<KeyOpFieldsValuesTuple>> zeroProfilesInfo) :
Orch(tables),
m_platform(),
m_bufferDirections({BUFFER_INGRESS, BUFFER_EGRESS}),
m_bufferObjectNames({"priority group", "queue"}),
m_bufferDirectionNames({"ingress", "egress"}),
m_bufferDirections{BUFFER_INGRESS, BUFFER_EGRESS},
m_bufferObjectNames{"priority group", "queue"},
m_bufferDirectionNames{"ingress", "egress"},
m_applDb(applDb),
m_zeroProfilesLoaded(false),
m_supportRemoving(true),
m_cfgDefaultLosslessBufferParam(cfgDb, CFG_DEFAULT_LOSSLESS_BUFFER_PARAMETER),
m_cfgDeviceMetaDataTable(cfgDb, CFG_DEVICE_METADATA_TABLE_NAME),
m_applBufferPoolTable(applDb, APP_BUFFER_POOL_TABLE_NAME),
m_applBufferProfileTable(applDb, APP_BUFFER_PROFILE_TABLE_NAME),
m_applBufferObjectTables({ProducerStateTable(applDb, APP_BUFFER_PG_TABLE_NAME), ProducerStateTable(applDb, APP_BUFFER_QUEUE_TABLE_NAME)}),
m_applBufferProfileListTables({ProducerStateTable(applDb, APP_BUFFER_PORT_INGRESS_PROFILE_LIST_NAME), ProducerStateTable(applDb, APP_BUFFER_PORT_EGRESS_PROFILE_LIST_NAME)}),
m_applBufferObjectTables{ProducerStateTable(applDb, APP_BUFFER_PG_TABLE_NAME), ProducerStateTable(applDb, APP_BUFFER_QUEUE_TABLE_NAME)},
m_applBufferProfileListTables{ProducerStateTable(applDb, APP_BUFFER_PORT_INGRESS_PROFILE_LIST_NAME), ProducerStateTable(applDb, APP_BUFFER_PORT_EGRESS_PROFILE_LIST_NAME)},
m_statePortTable(stateDb, STATE_PORT_TABLE_NAME),
m_stateBufferMaximumTable(stateDb, STATE_BUFFER_MAXIMUM_VALUE_TABLE),
m_stateBufferPoolTable(stateDb, STATE_BUFFER_POOL_TABLE_NAME),
Expand Down
1 change: 1 addition & 0 deletions lib/subintf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <cstring>
#include <array>
#include <net/if.h>
#include <stdexcept>
#include "subintf.h"

using namespace swss;
Expand Down
2 changes: 2 additions & 0 deletions lib/subintf.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include <string>

#define VLAN_SUB_INTERFACE_SEPARATOR "."
namespace swss {
class subIntf
Expand Down
1 change: 1 addition & 0 deletions orchagent/directory.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <typeinfo>
#include <string>
#include <stdexcept>
#include <unordered_map>
#include <algorithm>

Expand Down
2 changes: 1 addition & 1 deletion orchagent/mplsrouteorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ bool RouteOrch::addLabelRoute(LabelRouteBulkContext& ctx, const NextHopGroupKey
Label& label = ctx.label;

/* next_hop_id indicates the next hop id or next hop group id of this route */
sai_object_id_t next_hop_id;
sai_object_id_t next_hop_id = SAI_NULL_OBJECT_ID;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems a valid bug fix. If true, let's backport to other branches. And better to have a separate PR just for it.

bool blackhole = false;

if (m_syncdLabelRoutes.find(vrf_id) == m_syncdLabelRoutes.end())
Expand Down