diff options
| author | wiedi <wiedi> | 2014-02-22 14:14:01 +0000 |
|---|---|---|
| committer | wiedi <wiedi> | 2014-02-22 14:14:01 +0000 |
| commit | fd7691ce44b8fd5b8878d881aadb027681aede05 (patch) | |
| tree | e7cd59ad62b6ccf34d21da84a2d4d3640d8aac27 | |
| parent | 4f744f0929e521ff05304cde7d2474fccbebb90d (diff) | |
| download | pkgsrc-fd7691ce44b8fd5b8878d881aadb027681aede05.tar.gz | |
Fix "pow(int) is ambigous" on SunOS
| -rw-r--r-- | databases/mysqlcc/distinfo | 3 | ||||
| -rw-r--r-- | databases/mysqlcc/patches/patch-src_CSqlTable.cpp | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/databases/mysqlcc/distinfo b/databases/mysqlcc/distinfo index bcdc780a671..feab7f5e9d3 100644 --- a/databases/mysqlcc/distinfo +++ b/databases/mysqlcc/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.5 2013/09/17 11:35:47 obache Exp $ +$NetBSD: distinfo,v 1.6 2014/02/22 14:14:01 wiedi Exp $ SHA1 (mysqlcc-1.0.2-src.tar.gz) = 8f4846c3d64078eae433784b4d69dd355e45ade9 RMD160 (mysqlcc-1.0.2-src.tar.gz) = ebfcdabd1791b021df8b88c3874e5a8d413bf1b5 Size (mysqlcc-1.0.2-src.tar.gz) = 6673848 bytes SHA1 (patch-ae) = 1ca050f7bbd65ef5911a32283fd832741942f623 SHA1 (patch-af) = 2aa7b24355df675e1f116cad23ed1830551696fd +SHA1 (patch-src_CSqlTable.cpp) = 560000201257a89d85f0601a0aeb1ed1756c95f8 diff --git a/databases/mysqlcc/patches/patch-src_CSqlTable.cpp b/databases/mysqlcc/patches/patch-src_CSqlTable.cpp new file mode 100644 index 00000000000..22132233a7e --- /dev/null +++ b/databases/mysqlcc/patches/patch-src_CSqlTable.cpp @@ -0,0 +1,23 @@ +$NetBSD: patch-src_CSqlTable.cpp,v 1.1 2014/02/22 14:14:01 wiedi Exp $ + +fix "pow(int) is ambigous" on SunOS +--- src/CSqlTable.cpp.orig 2006-08-11 20:29:12.000000000 +0000 ++++ src/CSqlTable.cpp +@@ -688,7 +688,7 @@ char * CSqlTable::getWhereClause(int row + { + len += field->length() + 1; + if (field->isPresision()) +- len += 10 + QString::number(pow(0.1, field->decimals())).length(); ++ len += 10 + QString::number(pow(0.1, (double)field->decimals())).length(); + } + else + len_tmp += field->length() * 2 + 4; +@@ -711,7 +711,7 @@ char * CSqlTable::getWhereClause(int row + + if (field->isPresision()) + { +- QString tmp = "ABS(" + it.data() + " - " + field->value() + ") < " + QString::number(pow(0.1, field->decimals())); ++ QString tmp = "ABS(" + it.data() + " - " + field->value() + ") < " + QString::number(pow(0.1, (double)field->decimals())); + end_ptr = strmov(end_ptr, (const char *)(mysql()->mysql()->codec()->fromUnicode(tmp))); + } + else |