libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

shared pointer is now from std C++/11; refs #26

Browse Source
This commit is contained in:
Marc Wäckerlin
2013-06-13 09:07:38 +00:00
parent acd825d6fa
commit 8558d370f0
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@@ -0,0 +1,5 @@
Now requires a C++ 11 compiler.
For gcc, configure with:
CPPFLAGS=-std=c++0x ./configure

2
libpcscxx.spec.in
View File

@@ -6,7 +6,7 @@ License: LGPL
Group: Development/Libraries/C++ Group: Development/Libraries/C++
URL: https://dev.marc.waeckerlin.org/projects/@PACKAGENAME@ URL: https://dev.marc.waeckerlin.org/projects/@PACKAGENAME@
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRequires: subversion gcc-c++ doxygen graphviz texlive automake autoconf libtool make pcsc-lite-devel boost-devel BuildRequires: subversion gcc-c++ doxygen graphviz texlive automake autoconf libtool make pcsc-lite-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
BuildRequires: cppunit-devel openssl-devel BuildRequires: cppunit-devel openssl-devel

10
src/pcsc.hxx
View File

@@ -73,7 +73,6 @@
} }
#endif #endif
#include <boost/shared_ptr.hpp>
#include <vector> #include <vector>
#include <map> #include <map>
#include <memory> #include <memory>
@@ -257,7 +256,6 @@ namespace pcsc {
claInsP1P2.push_back(ins); claInsP1P2.push_back(ins);
claInsP1P2.push_back(p1); claInsP1P2.push_back(p1);
claInsP1P2.push_back(p2); claInsP1P2.push_back(p2);
assert(claInsP1P2.size()==4);
return transmit(claInsP1P2, lc, le); return transmit(claInsP1P2, lc, le);
} }
@@ -270,7 +268,6 @@ namespace pcsc {
claInsP1P2.push_back(ins); claInsP1P2.push_back(ins);
claInsP1P2.push_back(p1); claInsP1P2.push_back(p1);
claInsP1P2.push_back(p2); claInsP1P2.push_back(p2);
assert(claInsP1P2.size()==4);
return transmit(claInsP1P2, std::string(), le); return transmit(claInsP1P2, std::string(), le);
} }
@@ -284,7 +281,6 @@ namespace pcsc {
claInsP1P2.push_back(ins); claInsP1P2.push_back(ins);
claInsP1P2.push_back(p1); claInsP1P2.push_back(p1);
claInsP1P2.push_back(p2); claInsP1P2.push_back(p2);
assert(claInsP1P2.size()==4);
return transmit(claInsP1P2, std::string(lc, len), le); return transmit(claInsP1P2, std::string(lc, len), le);
} }
@@ -523,7 +519,9 @@ namespace pcsc {
connection to the reader, then access it. */ connection to the reader, then access it. */
Reader& reader(const std::string& name) { Reader& reader(const std::string& name) {
if (_reader.find(name)==_reader.end()) if (_reader.find(name)==_reader.end())
_reader.insert(std::make_pair(name, new Reader(name, *this))); _reader.insert
(std::make_pair
(name, std::shared_ptr<Reader>(new Reader(name, *this))));
return *_reader.find(name)->second; return *_reader.find(name)->second;
} }
@@ -832,7 +830,7 @@ namespace pcsc {
bool _exc; bool _exc;
SCARDCONTEXT _id; SCARDCONTEXT _id;
long _state; long _state;
std::map<std::string, boost::shared_ptr<Reader> > _reader; std::map<std::string, std::shared_ptr<Reader> > _reader;
}; };