* setup.py: remove extra linkargs for win32
* tdm_termite.cpp: explicit cast to unsigned int
This commit is contained in:
parent
d2453427c7
commit
35c5ac9e75
@ -20,7 +20,7 @@ if sys.platform == "linux" or sys.platform == "darwin" :
|
|||||||
lnkargs = ['-std=c++17','-Wno-unused-variable']
|
lnkargs = ['-std=c++17','-Wno-unused-variable']
|
||||||
elif sys.platform == "win32" :
|
elif sys.platform == "win32" :
|
||||||
cmpargs = ['/EHsc','/std:c++17']
|
cmpargs = ['/EHsc','/std:c++17']
|
||||||
lnkargs = ['/EHsc','/std:c++17']
|
lnkargs = []
|
||||||
else :
|
else :
|
||||||
raise RuntimeError("unknown platform")
|
raise RuntimeError("unknown platform")
|
||||||
|
|
||||||
|
@ -852,7 +852,7 @@ void tdm_termite::print_group(std::string &id, const char* filename, bool includ
|
|||||||
for ( std::string chn: chngrp.channels_ )
|
for ( std::string chn: chngrp.channels_ )
|
||||||
{
|
{
|
||||||
std::vector<tdmdatatype> chndat = this->get_channel(chn);
|
std::vector<tdmdatatype> chndat = this->get_channel(chn);
|
||||||
if ( chndat.size() > maxrows ) maxrows = chndat.size();
|
if ( chndat.size() > maxrows ) maxrows = (unsigned int)chndat.size();
|
||||||
allchns.push_back(chndat);
|
allchns.push_back(chndat);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ if sys.platform == "linux" or sys.platform == "darwin" :
|
|||||||
lnkargs = ['-std=c++17','-Wno-unused-variable']
|
lnkargs = ['-std=c++17','-Wno-unused-variable']
|
||||||
elif sys.platform == "win32" :
|
elif sys.platform == "win32" :
|
||||||
cmpargs = ['/EHsc','/std:c++17']
|
cmpargs = ['/EHsc','/std:c++17']
|
||||||
lnkargs = ['/EHsc','/std:c++17']
|
lnkargs = []
|
||||||
else :
|
else :
|
||||||
raise RuntimeError("unknown platform")
|
raise RuntimeError("unknown platform")
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user