From 1db3c98a29aa66fb8656ba349374e2d272a46d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Tue, 4 Mar 2014 07:51:30 +0000 Subject: [PATCH] fixed for QT4/5: Compile problem; refs #28 --- src/cryptoki.hxx | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/cryptoki.hxx b/src/cryptoki.hxx index 0e6d351..846f699 100644 --- a/src/cryptoki.hxx +++ b/src/cryptoki.hxx @@ -879,16 +879,10 @@ namespace cryptoki { CRYPTOLOG("ID="<<_slot); } - private: - - /// Slots are created from Library::slotList. - Slot(const Library& lib, CK_SLOT_ID slot): - _library(lib), _slot(slot), _res(CKR_OK) { - CRYPTOLOG("ID="<<_slot); - } - /// Slots are created from Library::slotList. - /** Empty constructor needs immediate assignment. */ + /** @note Empty constructor needs immediate assignment. This + constructor is public only to be inserted to STL + containers. */ Slot(): _slot(0), _res(-1) { CRYPTOLOG("ID="<<_slot); } @@ -901,6 +895,14 @@ namespace cryptoki { return *this; } + private: + + /// Slots are created from Library::slotList. + Slot(const Library& lib, CK_SLOT_ID slot): + _library(lib), _slot(slot), _res(CKR_OK) { + CRYPTOLOG("ID="<<_slot); + } + bool check(CK_RV result, const std::string& context="") { _res = result; if (_library.exc() && !*this) {