cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

biology/jellyfish: Patch for clang 10

Browse Source 
Add cast to silence implicit conversion error

PR:             ports/244645
Submitted by:   dim
This commit is contained in:
Jason W. Bacon 2020-03-07 19:25:54 +00:00
parent 3ebe952e96
commit 4906705775
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=527971
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
biology/jellyfish/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= Jellyfish
DISTVERSIONPREFIX= v
DISTVERSION= 2.2.10
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= biology
MAINTAINER= jwb@FreeBSD.org

20
biology/jellyfish/files/patch-lib_jsoncpp.cpp Normal file
View File

@ -0,0 +1,20 @@
--- lib/jsoncpp.cpp.orig 2018-04-16 12:46:09 UTC
+++ lib/jsoncpp.cpp
@@ -2300,7 +2300,7 @@ Value::asInt64() const
JSON_ASSERT_MESSAGE( value_.uint_ <= UInt64(maxInt64), "unsigned integer out of Int64 range" );
return value_.uint_;
case realValue:
- JSON_ASSERT_MESSAGE( value_.real_ >= minInt64 && value_.real_ <= maxInt64, "Real out of Int64 range" );
+ JSON_ASSERT_MESSAGE( value_.real_ >= minInt64 && value_.real_ < static_cast<double>(maxInt64), "Real out of Int64 range" );
return Int( value_.real_ );
case booleanValue:
return value_.bool_ ? 1 : 0;
@@ -2328,7 +2328,7 @@ Value::asUInt64() const
case uintValue:
return value_.uint_;
case realValue:
- JSON_ASSERT_MESSAGE( value_.real_ >= 0 && value_.real_ <= maxUInt64, "Real out of UInt64 range" );
+ JSON_ASSERT_MESSAGE( value_.real_ >= 0 && value_.real_ < static_cast<double>(maxUInt64), "Real out of UInt64 range" );
return UInt( value_.real_ );
case booleanValue:
return value_.bool_ ? 1 : 0;

4
biology/jellyfish/files/patch-sub__commands_count__main.cc
View File

@ -1,6 +1,6 @@
--- sub_commands/count_main.cc.orig 2019-05-13 07:42:50 UTC
--- sub_commands/count_main.cc.orig 2018-04-16 12:46:09 UTC
+++ sub_commands/count_main.cc
@@ -330,7 +330,7 @@ int count_main(int argc, char *argv[])
@@ -360,7 +360,7 @@ int count_main(int argc, char *argv[])
uint64_t max = args.upper_count_given ? args.upper_count_arg : std::numeric_limits<uint64_t>::max();
try {
merge_files(files, args.output_arg, header, min, max);