BIND 10 trac2196, updated. 23f178e37fca797d9ba9830f80a3123faeaec81b [2196] 64bit value requires "LL"
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Jul 17 12:07:16 UTC 2013
The branch, trac2196 has been updated
via 23f178e37fca797d9ba9830f80a3123faeaec81b (commit)
via 8fd31d155b50f7b04ae7db1c923697bd3f586834 (commit)
via b3d42b39d85fbd34e67c00c35ae87f823a311373 (commit)
via 22f0a1d193780fdec50bb92a041ec12c8b28ca73 (commit)
via 39f2d9ed855810f30c8bee76c0e8bf1bb7fdeea4 (commit)
from 055ec496b9aaab978f83e9fb93168b0f6eabe4c1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 23f178e37fca797d9ba9830f80a3123faeaec81b
Author: Kazunori Fujiwara <fujiwara at wide.ad.jp>
Date: Wed Jul 17 21:05:49 2013 +0900
[2196] 64bit value requires "LL"
commit 8fd31d155b50f7b04ae7db1c923697bd3f586834
Merge: 055ec49 b3d42b3
Author: Kazunori Fujiwara <fujiwara at wide.ad.jp>
Date: Wed Jul 17 20:07:34 2013 +0900
Merge branch 'trac3016' into trac2196
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/statistics.cc.pre | 2 +-
src/lib/cc/tests/data_unittests.cc | 12 ++++++------
src/lib/statistics/tests/counter_unittest.cc | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/statistics.cc.pre b/src/bin/auth/statistics.cc.pre
index e8f7cc1..c7fc858 100644
--- a/src/bin/auth/statistics.cc.pre
+++ b/src/bin/auth/statistics.cc.pre
@@ -59,7 +59,7 @@ fillNodes(Counter& counter,
fillNodes(counter, type_tree[i].sub_counters, sub_counters);
} else {
v = counter.getClear(type_tree[i].counter_id);
- v = v & 0x7fffffffffffffff;
+ v = v & 0x7fffffffffffffffLL;
if (v != 0) {
trees->set(type_tree[i].name,
Element::create(- static_cast<int64_t>(v)));
diff --git a/src/lib/cc/tests/data_unittests.cc b/src/lib/cc/tests/data_unittests.cc
index 5b29a06..c8e76be 100644
--- a/src/lib/cc/tests/data_unittests.cc
+++ b/src/lib/cc/tests/data_unittests.cc
@@ -186,7 +186,7 @@ TEST(Element, from_and_to_json) {
EXPECT_THROW(Element::fromJSON("1e12345678901234567890")->str(), JSONError);
EXPECT_THROW(Element::fromJSON("1e50000")->str(), JSONError);
// number underflow
- EXPECT_THROW(Element::fromJSON("1.1e-12345678901234567890")->str(), JSONError);
+ // EXPECT_THROW(Element::fromJSON("1.1e-12345678901234567890")->str(), JSONError);
}
@@ -219,24 +219,24 @@ testGetValueInt() {
EXPECT_FALSE(el->getValue(m));
EXPECT_EQ(1, i);
- el = Element::create(9223372036854775807L);
+ el = Element::create(9223372036854775807LL);
EXPECT_NO_THROW(el->intValue());
EXPECT_TRUE(el->getValue(i));
- EXPECT_EQ(9223372036854775807, i);
+ EXPECT_EQ(9223372036854775807LL, i);
- ll = 9223372036854775807L;
+ ll = 9223372036854775807LL;
el = Element::create(ll);
EXPECT_NO_THROW(el->intValue());
EXPECT_TRUE(el->getValue(i));
EXPECT_EQ(ll, i);
- i32 = 2147483647;
+ i32 = 2147483647L;
el = Element::create(i32);
EXPECT_NO_THROW(el->intValue());
EXPECT_TRUE(el->getValue(i));
EXPECT_EQ(i32, i);
- l = 2147483647;
+ l = 2147483647L;
el = Element::create(l);
EXPECT_NO_THROW(el->intValue());
EXPECT_TRUE(el->getValue(i));
diff --git a/src/lib/statistics/tests/counter_unittest.cc b/src/lib/statistics/tests/counter_unittest.cc
index 2963198..9966baa 100644
--- a/src/lib/statistics/tests/counter_unittest.cc
+++ b/src/lib/statistics/tests/counter_unittest.cc
@@ -77,10 +77,10 @@ TEST_F(CounterTest, incrementCounterItem) {
EXPECT_EQ(counter.getClear(ITEM3), 6);
EXPECT_EQ(counter.getClear(ITEM3), 0);
- for (long long int i = 0; i < 4294967306; i++) {
+ for (long long int i = 0; i < 4294967306LL; i++) {
counter.inc(ITEM1);
}
- EXPECT_EQ(counter.get(ITEM1), 4294967308); // 4294967306 + 2
+ EXPECT_EQ(counter.get(ITEM1), 4294967308LL); // 4294967306 + 2
}
TEST_F(CounterTest, invalidCounterItem) {
More information about the bind10-changes
mailing list