Skip to content

Commit 4d33c40

Browse files
committed
Merge remote-tracking branch 'origin/master' into show-hide-guides
2 parents 37f54d9 + ab0a401 commit 4d33c40

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/odb/include/odb/db.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7665,11 +7665,11 @@ class dbGuide : public dbObject
76657665

76667666
static dbSet<dbGuide>::iterator destroy(dbSet<dbGuide>::iterator& itr);
76677667

7668-
bool isJumper();
7668+
bool isJumper() const;
76697669

76707670
void setIsJumper(bool jumper);
76717671

7672-
bool isConnectedToTerm();
7672+
bool isConnectedToTerm() const;
76737673

76747674
void setIsConnectedToTerm(bool is_connected);
76757675

src/odb/src/db/dbGuide.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ dbSet<dbGuide>::iterator dbGuide::destroy(dbSet<dbGuide>::iterator& itr)
244244
return next;
245245
}
246246

247-
bool dbGuide::isJumper()
247+
bool dbGuide::isJumper() const
248248
{
249249
bool is_jumper = false;
250250
_dbGuide* guide = (_dbGuide*) this;
@@ -264,7 +264,7 @@ void dbGuide::setIsJumper(bool jumper)
264264
}
265265
}
266266

267-
bool dbGuide::isConnectedToTerm()
267+
bool dbGuide::isConnectedToTerm() const
268268
{
269269
bool is_connected_to_term = false;
270270
_dbGuide* guide = (_dbGuide*) this;

0 commit comments

Comments
 (0)