// 2001-11-19 Benjamin Kosnik <bkoz@redhat.com>
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
typedef num_put<char, iter_type> num_put_type;
const locale loc_c = locale::classic();
const string str("1798 Lady Elgin");
- const string str2("0 true 0xbffff74c Mary Nisbet");
- const string x(15, 'x'); // have to have allocated string!
+ const string x(18, 'x'); // have to have allocated string!
+ // allow for "0x" + 16 hex digits (64-bit pointer)
string res;
ostringstream oss;
res = x;
iter_type ret1 = tp.put(res.begin(), oss, ' ', l);
string sanity1(res.begin(), ret1);
- VERIFY( res == "1798xxxxxxxxxxx" );
+ VERIFY( res == "1798xxxxxxxxxxxxxx" );
VERIFY( sanity1 == "1798" );
// 02 put(long double)
res = x;
iter_type ret2 = tp.put(res.begin(), oss, ' ', ld);
string sanity2(res.begin(), ret2);
- VERIFY( res == "1798xxxxxxxxxxx" );
+ VERIFY( res == "1798xxxxxxxxxxxxxx" );
VERIFY( sanity2 == "1798" );
// 03 put(bool)
res = x;
iter_type ret3 = tp.put(res.begin(), oss, ' ', b);
string sanity3(res.begin(), ret3);
- VERIFY( res == "1xxxxxxxxxxxxxx" );
+ VERIFY( res == "1xxxxxxxxxxxxxxxxx" );
VERIFY( sanity3 == "1" );
b = 0;
oss.setf(ios_base::boolalpha);
iter_type ret4 = tp.put(res.begin(), oss, ' ', b);
string sanity4(res.begin(), ret4);
- VERIFY( res == "falsexxxxxxxxxx" );
+ VERIFY( res == "falsexxxxxxxxxxxxx" );
VERIFY( sanity4 == "false" );
// 04 put(void*)
// 2001-11-19 Benjamin Kosnik <bkoz@redhat.com>
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
typedef num_put<wchar_t, iter_type> num_put_type;
const locale loc_c = locale::classic();
const wstring str(L"1798 Lady Elgin");
- const wstring str2(L"0 true 0xbffff74c Mary Nisbet");
- const wstring x(15, L'x'); // have to have allocated wstring!
- wstring res;
+ const wstring x(18, L'x'); // have to have allocated wstring!
+ wstring res; // allow for "0x" + 16 hex digits (64-bit pointer)
wostringstream oss;
oss.imbue(locale(loc_c, new num_put_type));
res = x;
iter_type ret1 = tp.put(res.begin(), oss, ' ', l);
wstring sanity1(res.begin(), ret1);
- VERIFY( res == L"1798xxxxxxxxxxx" );
+ VERIFY( res == L"1798xxxxxxxxxxxxxx" );
VERIFY( sanity1 == L"1798" );
// 02 put(long double)
res = x;
iter_type ret2 = tp.put(res.begin(), oss, ' ', ld);
wstring sanity2(res.begin(), ret2);
- VERIFY( res == L"1798xxxxxxxxxxx" );
+ VERIFY( res == L"1798xxxxxxxxxxxxxx" );
VERIFY( sanity2 == L"1798" );
// 03 put(bool)
res = x;
iter_type ret3 = tp.put(res.begin(), oss, ' ', b);
wstring sanity3(res.begin(), ret3);
- VERIFY( res == L"1xxxxxxxxxxxxxx" );
+ VERIFY( res == L"1xxxxxxxxxxxxxxxxx" );
VERIFY( sanity3 == L"1" );
b = 0;
oss.setf(ios_base::boolalpha);
iter_type ret4 = tp.put(res.begin(), oss, ' ', b);
wstring sanity4(res.begin(), ret4);
- VERIFY( res == L"falsexxxxxxxxxx" );
+ VERIFY( res == L"falsexxxxxxxxxxxxx" );
VERIFY( sanity4 == L"false" );
// 04 put(void*)
iter_type ret5 = tp.put(res.begin(), oss, ' ', cv);
wstring sanity5(res.begin(), ret5);
VERIFY( sanity5.size() );
- VERIFY( sanity5[1] == 'x' );
+ VERIFY( sanity5[1] == L'x' );
}
int main()