- fixes from Harro

This commit is contained in:
Niels 2013-07-05 11:23:49 +02:00
parent 23ada516aa
commit 61461ec456
3 changed files with 96 additions and 13 deletions

View file

@ -202,20 +202,78 @@ void test_array() {
#endif
// iterators
for (JSON::iterator i = a.begin(); i != a.end(); ++i) {
std::cerr << *i << '\n';
{
size_t count = 0;
for (JSON::iterator i = a.begin(); i != a.end(); ++i) {
std::cerr << *i << '\n';
count++;
}
assert(count == a.size());
}
for (JSON::const_iterator i = a.cbegin(); i != a.cend(); ++i) {
std::cerr << *i << '\n';
{
/*
size_t count = 0;
for (JSON::const_iterator i = a.begin(); i != a.end(); ++i) {
std::cerr << *i << '\n';
count++;
}
assert(count == a.size());
*/
}
{
size_t count = 0;
for (JSON::const_iterator i = a.cbegin(); i != a.cend(); ++i) {
std::cerr << *i << '\n';
count++;
}
assert(count == a.size());
}
#ifdef __cplusplus11
for (auto element : a) {
std::cerr << element << '\n';
{
size_t count = 0;
for (auto element : a) {
std::cerr << element << '\n';
count++;
}
assert(count == a.size());
}
#endif
{
JSON::iterator i;
size_t count = 0;
for (i = a.begin(); i != a.end(); ++i) {
std::cerr << *i << '\n';
count++;
}
assert(count == a.size());
}
{
/*
JSON::const_iterator i;
size_t count = 0;
for (i = a.begin(); i != a.end(); ++i) {
std::cerr << *i << '\n';
count++;
}
assert(count == a.size());
*/
}
{
JSON::const_iterator i;
size_t count = 0;
for (i = a.cbegin(); i != a.cend(); ++i) {
std::cerr << *i << '\n';
count++;
}
assert(count == a.size());
}
{
// get payload
std::vector<JSON>* array = static_cast<std::vector<JSON>*>(a.data());