libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

fixed for QT4/5: Compile problem; refs #28

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-03-04 07:51:30 +00:00
parent 9402374d84
commit 1db3c98a29
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cryptoki.hxx
View File

@@ -879,16 +879,10 @@ namespace cryptoki {
CRYPTOLOG("ID="<<_slot); CRYPTOLOG("ID="<<_slot);
} }
private:
/// Slots are created from Library::slotList. /// Slots are created from Library::slotList.
Slot(const Library& lib, CK_SLOT_ID slot): /** @note Empty constructor needs immediate assignment. This
_library(lib), _slot(slot), _res(CKR_OK) { constructor is public only to be inserted to STL
CRYPTOLOG("ID="<<_slot); containers. */
}
/// Slots are created from Library::slotList.
/** Empty constructor needs immediate assignment. */
Slot(): _slot(0), _res(-1) { Slot(): _slot(0), _res(-1) {
CRYPTOLOG("ID="<<_slot); CRYPTOLOG("ID="<<_slot);
} }
@@ -901,6 +895,14 @@ namespace cryptoki {
return *this; 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="") { bool check(CK_RV result, const std::string& context="") {
_res = result; _res = result;
if (_library.exc() && !*this) { if (_library.exc() && !*this) {