Skip to content

Commit a2c1095

Browse files
author
Maxime Chamley
committed
Define Director before SWIG includes
1 parent 4a6554c commit a2c1095

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

sources/LibLogicalAccessNet.win32/liblogicalaccess_reader.i

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,11 @@ typedef enum : uint16_t
494494
} SCardProtocol;
495495
%}
496496

497+
%ignore logicalaccess::PCSCReaderUnit::getT_CL_ISOType;
498+
%ignore logicalaccess::PCSCReaderUnit::reconnect;
499+
%feature("director") ISO7816ReaderUnit;
500+
%feature("director") PCSCReaderUnit;
501+
497502
/* Include_section */
498503

499504
%include <logicalaccess/plugins/readers/deister/lla_readers_deister_api.hpp>
@@ -757,5 +762,3 @@ typedef enum : uint16_t
757762
#ifdef BUILD_PRIVATE
758763
%template(SIOCryptoContextVector) std::vector<logicalaccess::SIO::CryptoContext>;
759764
#endif
760-
761-
%feature("director") PCSCReaderUnit;

sources/LibLogicalAccessNet/LibLogicalAccessNet.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<AssemblyName>LibLogicalAccessNet$(ASSEMBLYAPPENDER)</AssemblyName>
55
<RootNamespace>LibLogicalAccess</RootNamespace>
66
<Description>ISLOG RFID library layer for C#</Description>
7-
<Copyright>Copyright (C) 2021</Copyright>
8-
<Version>2.4.0-develop0001</Version>
9-
<AssemblyVersion>2.4.0.0</AssemblyVersion>
10-
<FileVersion>2.4.0.0</FileVersion>
7+
<Copyright>Copyright (C) HID Global 2022</Copyright>
8+
<Version>2.4.2</Version>
9+
<AssemblyVersion>2.4.2.0</AssemblyVersion>
10+
<FileVersion>2.4.2.0</FileVersion>
1111
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
1212
<Company>HID Global</Company>
1313
<Authors>HID Global</Authors>

sources/TestCore/CallBackReaderUnit.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@ public void SimpleReaderUnitTest()
6363
r2.setConfiguration(ru.getConfiguration());
6464
r2.setDataTransport(ru.getDataTransport());
6565
r2.setDefaultReaderCardAdapter(ru.getDefaultReaderCardAdapter());
66-
bool typeA = true;
66+
/*bool typeA = true;
6767
bool typeB = false;
6868
Console.WriteLine("Cool: " + typeA + ". B: " + typeB);
6969
r2simple.getT_CL_ISOType(ref typeA, ref typeB);
70-
Console.WriteLine("Cool: " + typeA + ". B: " + typeB);
70+
Console.WriteLine("Cool: " + typeA + ". B: " + typeB);*/
7171
r2.connectToReader();
7272
r2.waitInsertion(1000);
7373

7474
// Double connect. LLA code should call disconnect() internally.
7575
// Yes, this test relies on LLA implementation details, but well...
7676
r2.connect();
7777
r2.connect();
78-
r2simple.getT_CL_ISOType(ref typeA, ref typeB);
79-
Console.WriteLine("Cool: " + typeA + ". B: " + typeB);
78+
/*r2simple.getT_CL_ISOType(ref typeA, ref typeB);
79+
Console.WriteLine("Cool: " + typeA + ". B: " + typeB);*/
8080
r2.disconnectFromReader();
8181
Assert.IsTrue(r2simple.hasBeenCalled);
8282
}

0 commit comments

Comments
 (0)