summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/test_xpath_api.cpp2
-rw-r--r--tests/test_xpath_variables.cpp22
2 files changed, 12 insertions, 12 deletions
diff --git a/tests/test_xpath_api.cpp b/tests/test_xpath_api.cpp
index 295bd95..bca22de 100644
--- a/tests/test_xpath_api.cpp
+++ b/tests/test_xpath_api.cpp
@@ -614,7 +614,7 @@ TEST(xpath_api_query_vector)
for (int i = 0; i < 10; ++i)
{
char_t expr[2];
- expr[0] = '0' + char_t(i);
+ expr[0] = char_t('0' + i);
expr[1] = 0;
qv.push_back(xpath_query(expr));
diff --git a/tests/test_xpath_variables.cpp b/tests/test_xpath_variables.cpp
index c4a3b7f..ab436cd 100644
--- a/tests/test_xpath_variables.cpp
+++ b/tests/test_xpath_variables.cpp
@@ -527,8 +527,8 @@ TEST(xpath_variables_copy_big)
{
char_t name[4];
name[0] = 'a';
- name[1] = '0' + char_t(i / 10);
- name[2] = '0' + char_t(i % 10);
+ name[1] = char_t('0' + i / 10);
+ name[2] = char_t('0' + i % 10);
name[3] = 0;
set.set(name, double(i));
@@ -536,15 +536,15 @@ TEST(xpath_variables_copy_big)
xpath_variable_set copy = set;
- for (int i = 0; i < 100; ++i)
+ for (int j = 0; j < 100; ++j)
{
char_t name[4];
name[0] = 'a';
- name[1] = '0' + char_t(i / 10);
- name[2] = '0' + char_t(i % 10);
+ name[1] = char_t('0' + j / 10);
+ name[2] = char_t('0' + j % 10);
name[3] = 0;
- CHECK(copy.get(name) && copy.get(name)->get_number() == i);
+ CHECK(copy.get(name) && copy.get(name)->get_number() == j);
}
}
@@ -556,8 +556,8 @@ TEST(xpath_variables_copy_big_out_of_memory)
{
char_t name[4];
name[0] = 'a';
- name[1] = '0' + char_t(i / 10);
- name[2] = '0' + char_t(i % 10);
+ name[1] = char_t('0' + i / 10);
+ name[2] = char_t('0' + i % 10);
name[3] = 0;
set.set(name, double(i));
@@ -568,12 +568,12 @@ TEST(xpath_variables_copy_big_out_of_memory)
xpath_variable_set copy;
CHECK_ALLOC_FAIL(copy = set);
- for (int i = 0; i < 100; ++i)
+ for (int j = 0; j < 100; ++j)
{
char_t name[4];
name[0] = 'a';
- name[1] = '0' + char_t(i / 10);
- name[2] = '0' + char_t(i % 10);
+ name[1] = char_t('0' + j / 10);
+ name[2] = char_t('0' + j % 10);
name[3] = 0;
CHECK(!copy.get(name));