mario/IMCtermite
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix/disable type conversion warnings

Browse Source
This commit is contained in:
Mario Fink 2021-09-02 11:16:01 +02:00
parent b51b63dedc
commit 6bc6880d47
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/imc_channel.hpp
View File

@ -108,7 +108,7 @@ namespace imc
std::string joinvec(std::vector<dt> myvec, unsigned long int limit = 10, int prec = 10, bool fixed = true) std::string joinvec(std::vector<dt> myvec, unsigned long int limit = 10, int prec = 10, bool fixed = true)
{ {
// include entire list for limit = 0 // include entire list for limit = 0
limit = (limit == 0) ? myvec.size() : limit; limit = (limit == 0) ? (unsigned long int)myvec.size() : limit;
std::stringstream ss; std::stringstream ss;
ss<<"["; ss<<"[";
@ -122,14 +122,14 @@ namespace imc
} }
else else
{ {
unsigned long int heals = (unsigned long int)(limit/2.); unsigned long int heals = limit/2;
for ( unsigned long int i = 0; i < heals; i++ ) for ( unsigned long int i = 0; i < heals; i++ )
{ {
customize_stream(ss,prec,fixed); customize_stream(ss,prec,fixed);
ss<<myvec[i]<<","; ss<<myvec[i]<<",";
} }
ss<<"..."; ss<<"...";
for ( unsigned long int i = myvec.size()-heals; i < myvec.size(); i++ ) for ( unsigned long int i = myvec.size()-heals; i < (unsigned long int)myvec.size(); i++ )
{ {
customize_stream(ss,prec,fixed); customize_stream(ss,prec,fixed);
ss<<myvec[i]<<","; ss<<myvec[i]<<",";
@ -296,9 +296,9 @@ namespace imc
tms.tm_year = std::stoi(blocks_->at(chnenv_.NTuuid_).get_parameter(prms[4])) - 1900; tms.tm_year = std::stoi(blocks_->at(chnenv_.NTuuid_).get_parameter(prms[4])) - 1900;
tms.tm_hour = std::stoi(blocks_->at(chnenv_.NTuuid_).get_parameter(prms[5])); tms.tm_hour = std::stoi(blocks_->at(chnenv_.NTuuid_).get_parameter(prms[5]));
tms.tm_min = std::stoi(blocks_->at(chnenv_.NTuuid_).get_parameter(prms[6])); tms.tm_min = std::stoi(blocks_->at(chnenv_.NTuuid_).get_parameter(prms[6]));
double secs = std::stold(blocks_->at(chnenv_.NTuuid_).get_parameter(prms[7])); long double secs = std::stold(blocks_->at(chnenv_.NTuuid_).get_parameter(prms[7]));
double secs_int; double secs_int;
trigger_time_frac_secs_ = modf(secs,&secs_int); trigger_time_frac_secs_ = modf((double)secs,&secs_int);
tms.tm_sec = (int)secs_int; tms.tm_sec = (int)secs_int;
// generate std::chrono::system_clock::time_point type // generate std::chrono::system_clock::time_point type
@ -384,7 +384,7 @@ namespace imc
// fill xdata_ // fill xdata_
for ( unsigned long int i = 0; i < num_values; i++ ) for ( unsigned long int i = 0; i < num_values; i++ )
{ {
xdata_.push_back(xoffset_+i*xstepwidth_); xdata_.push_back(xoffset_+(double)i*xstepwidth_);
} }
// employ data transformation // employ data transformation

2
makefile
View File

@ -17,7 +17,7 @@ HPP = $(wildcard $(LIB)/*.hpp)
# choose compiler and its options # choose compiler and its options
CC = g++ -std=c++17 CC = g++ -std=c++17
#OPT = -O3 -Wall -mavx -mno-tbm -mf16c -mno-f16c #OPT = -O3 -Wall -mavx -mno-tbm -mf16c -mno-f16c
OPT = -O3 -Wall -Werror -Wunused-variable -Wsign-compare OPT = -O3 -Wall -Wconversion -Wpedantic -Werror -Wunused-variable -Wsign-compare
# determine git version/commit and release tag # determine git version/commit and release tag
GTAG := $(shell git tag -l --sort=version:refname | tail -n1) GTAG := $(shell git tag -l --sort=version:refname | tail -n1)