Skip to content

Commit 028d8bf

Browse files
committed
Don't pollute namespace w/ odb::dbTechLayerType; in header files.
Signed-off-by: Henner Zeller <[email protected]>
1 parent 3489966 commit 028d8bf

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

src/drt/src/db/tech/frLayer.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class frLayer
109109
{
110110
return (fakeCut_ || fakeMasterslice_)
111111
? false
112-
: db_layer_->getType() == dbTechLayerType::ROUTING;
112+
: db_layer_->getType() == odb::dbTechLayerType::ROUTING;
113113
}
114114
bool isUnidirectional() const
115115
{
@@ -137,14 +137,14 @@ class frLayer
137137
{
138138
return viaDefs_;
139139
}
140-
dbTechLayerType getType() const
140+
odb::dbTechLayerType getType() const
141141
{
142142
if (fakeCut_) {
143-
return dbTechLayerType::CUT;
143+
return odb::dbTechLayerType::CUT;
144144
}
145145

146146
if (fakeMasterslice_) {
147-
return dbTechLayerType::MASTERSLICE;
147+
return odb::dbTechLayerType::MASTERSLICE;
148148
}
149149

150150
return db_layer_->getType();

src/drt/src/db/tech/frTechObject.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ class frTechObject
244244
logger->report("Reporting layer properties.");
245245
for (auto& layer : layers_) {
246246
auto type = layer->getType();
247-
if (type == dbTechLayerType::CUT) {
247+
if (type == odb::dbTechLayerType::CUT) {
248248
logger->report("Cut layer {}.", layer->getName());
249-
} else if (type == dbTechLayerType::ROUTING) {
249+
} else if (type == odb::dbTechLayerType::ROUTING) {
250250
logger->report("Routing layer {}.", layer->getName());
251251
}
252252
layer->printAllConstraints(logger);
@@ -257,7 +257,7 @@ class frTechObject
257257
{
258258
logger->info(DRT, 167, "List of default vias:");
259259
for (auto& layer : layers_) {
260-
if (layer->getType() == dbTechLayerType::CUT
260+
if (layer->getType() == odb::dbTechLayerType::CUT
261261
&& layer->getLayerNum() >= router_cfg->BOTTOM_ROUTING_LAYER) {
262262
logger->report(" Layer {}", layer->getName());
263263
if (layer->getDefaultViaDef() != nullptr) {

src/drt/src/frBaseTypes.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ template <typename T>
4444
using frList = std::list<T>;
4545
template <typename T>
4646
using frListIter = typename std::list<T>::iterator;
47-
using odb::dbTechLayerType;
4847

4948
enum frEndStyleEnum
5049
{

src/drt/test/fixture.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Fixture : public ::testing::Test
5858

5959
void addLayer(frTechObject* tech,
6060
const char* name,
61-
dbTechLayerType type,
61+
odb::dbTechLayerType type,
6262
odb::dbTechLayerDir dir = odb::dbTechLayerDir::NONE);
6363

6464
odb::dbInst* createDummyInst(odb::dbMaster* master);

0 commit comments

Comments
 (0)