From 4b2f7ef3ad7d044d56e0af87b83f01915199bb61 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sat, 22 Aug 2015 22:20:58 +0200 Subject: [PATCH] fix a 32/64 bug the obnoxious problem with long, which is only 32bit on 32bit platforms. incidentally, sitting here at FrOSCon 15 in the Lumiera developers room --- tests/library/variant-test.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/library/variant-test.cpp b/tests/library/variant-test.cpp index d4f6c6a91..3546c6297 100644 --- a/tests/library/variant-test.cpp +++ b/tests/library/variant-test.cpp @@ -88,7 +88,7 @@ namespace test{ { Time someTime; TestVariant v0; - TestVariant v1(11L); + TestVariant v1(int64_t(11)); TestVariant v2(string("lololo")); TestVariant v3(someTime); @@ -210,18 +210,18 @@ namespace test{ verifyAssignment() { TestVariant v1(string("boo")); - TestVariant v2(23L); - TestVariant v3(42L); + TestVariant v2(int64_t(23)); + TestVariant v3(int64_t(42)); v1 = string("booo"); v2 = v3; - v3 = 24L; + v3 = int64_t(24); CHECK ("booo" == v1.get()); CHECK (42 == v2.get()); CHECK (24 == v3.get()); VERIFY_ERROR (WRONG_TYPE, v1 = v2 ); - VERIFY_ERROR (WRONG_TYPE, v1 = 22L ); + VERIFY_ERROR (WRONG_TYPE, v1 = int64_t(22)); VERIFY_ERROR (WRONG_TYPE, v2 = string("2")); TestVariant v4 = Time();