Skip to content

Commit f4cdb91

Browse files
committed
Moved deletions to public as suggested by Adriano
1 parent 28eb37d commit f4cdb91

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/jrd/Attachment.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,10 @@ class StableAttachmentPart : public Firebird::RefCounted, public Firebird::Globa
219219
: waiters(0), threadId(0), totalLocksCounter(0), currentLocksCounter(0)
220220
{ }
221221

222+
// copying is prohibited
223+
Sync(const Sync&) = delete;
224+
Sync& operator=(const Sync&) = delete;
225+
222226
void enter(const char* aReason)
223227
{
224228
const ThreadId curTid = getThreadId();
@@ -298,10 +302,6 @@ class StableAttachmentPart : public Firebird::RefCounted, public Firebird::Globa
298302
}
299303

300304
private:
301-
// copying is prohibited
302-
Sync(const Sync&) = delete;
303-
Sync& operator=(const Sync&) = delete;
304-
305305
Firebird::Mutex syncMutex;
306306
std::atomic<int> waiters;
307307
ThreadId threadId;
@@ -428,11 +428,11 @@ class Attachment : public pool_alloc<type_att>
428428
jStable->getSync()->leave();
429429
}
430430

431-
private:
432431
// copying is prohibited
433432
SyncGuard(const SyncGuard&) = delete;
434433
SyncGuard& operator=(const SyncGuard&) = delete;
435434

435+
private:
436436
void init(const char* f, bool optional);
437437

438438
Firebird::RefPtr<StableAttachmentPart> jStable;
@@ -944,6 +944,10 @@ class AttachmentsRefHolder
944944
: m_list(list), m_index(0)
945945
{}
946946

947+
// copying is prohibited
948+
Iterator(const Iterator&) = delete;
949+
Iterator& operator=(const Iterator&) = delete;
950+
947951
StableAttachmentPart* operator*() noexcept
948952
{
949953
if (m_index < m_list.m_attachments.getCount())
@@ -967,10 +971,6 @@ class AttachmentsRefHolder
967971
}
968972

969973
private:
970-
// copying is prohibited
971-
Iterator(const Iterator&) = delete;
972-
Iterator& operator=(const Iterator&) = delete;
973-
974974
AttachmentsRefHolder& m_list;
975975
FB_SIZE_T m_index;
976976
};

0 commit comments

Comments
 (0)