Author: faridz
Date: Thu Mar 27 08:52:44 2008
New Revision: 641861
URL: http://svn.apache.org/viewvc?rev=641861&view=rev
Log:
2008-03-27 Farid Zaripov <[EMAIL PROTECTED]>
* etc/config/src/EMPTY_MEM_INITIALIZER.cpp: Replace tab character to
spaces.
* etc/config/src/UNAME.cpp: Ditto.
* examples/manual/bitset.cpp: Ditto.
* examples/manual/codecvt.cpp: Ditto.
* examples/manual/codecvt1.cpp: Ditto.
* examples/manual/generate.cpp: Ditto.
* examples/manual/ifstream.cpp: Ditto.
* examples/manual/istringstream.cpp: Ditto.
* examples/manual/lex_compare.cpp: Ditto.
* examples/manual/max_elem.cpp: Ditto.
* examples/manual/memfunref.cpp: Ditto.
* examples/manual/merge.cpp: Ditto.
* examples/manual/mismatch.cpp: Ditto.
* examples/manual/partition.cpp: Ditto.
* examples/manual/remove.cpp: Ditto.
* examples/tutorial/spell.cpp: Ditto.
* include/loc/_moneypunct.h: Ditto.
* include/loc/_num_get.h: Ditto.
* include/rw/_exception.h: Ditto.
* include/rw/_tree.cc: Ditto.
* include/rw/_tree.h: Ditto.
* include/set: Ditto.
* include/sstream.cc: Ditto.
* src/exception.cpp: Ditto.
* src/ia64/atomic.s: Ditto.
* src/iostream.cpp: Ditto.
* src/iso2022.h: Ditto.
* src/messages.cpp: Ditto.
* src/valarray.cpp: Ditto.
* tests/localization/22.locale.ctype.tolower.cpp: Ditto.
* tests/localization/22.locale.ctype.toupper.cpp: Ditto.
* tests/localization/22.locale.messages.cpp: Ditto.
* tests/numerics/26.class.gslice.cpp: Ditto.
* tests/src/23.containers.cpp: Ditto.
* tests/src/ctype.cpp: Ditto.
* tests/src/locale.cpp: Ditto.
* tests/src/opt_lines.cpp: Ditto.
* util/aliases.cpp: Ditto.
* util/def.h: Ditto.
* util/scanner.cpp: Ditto.
* util/scanner.h: Ditto.
Modified:
stdcxx/trunk/etc/config/src/EMPTY_MEM_INITIALIZER.cpp
stdcxx/trunk/etc/config/src/UNAME.cpp
stdcxx/trunk/examples/manual/bitset.cpp
stdcxx/trunk/examples/manual/codecvt.cpp
stdcxx/trunk/examples/manual/codecvt1.cpp
stdcxx/trunk/examples/manual/generate.cpp
stdcxx/trunk/examples/manual/ifstream.cpp
stdcxx/trunk/examples/manual/istringstream.cpp
stdcxx/trunk/examples/manual/lex_compare.cpp
stdcxx/trunk/examples/manual/max_elem.cpp
stdcxx/trunk/examples/manual/memfunref.cpp
stdcxx/trunk/examples/manual/merge.cpp
stdcxx/trunk/examples/manual/mismatch.cpp
stdcxx/trunk/examples/manual/partition.cpp
stdcxx/trunk/examples/manual/remove.cpp
stdcxx/trunk/examples/tutorial/spell.cpp
stdcxx/trunk/include/loc/_moneypunct.h
stdcxx/trunk/include/loc/_num_get.h
stdcxx/trunk/include/rw/_exception.h
stdcxx/trunk/include/rw/_tree.cc
stdcxx/trunk/include/rw/_tree.h
stdcxx/trunk/include/set
stdcxx/trunk/include/sstream.cc
stdcxx/trunk/src/exception.cpp
stdcxx/trunk/src/ia64/atomic.s
stdcxx/trunk/src/iostream.cpp
stdcxx/trunk/src/iso2022.h
stdcxx/trunk/src/messages.cpp
stdcxx/trunk/src/valarray.cpp
stdcxx/trunk/tests/localization/22.locale.ctype.tolower.cpp
stdcxx/trunk/tests/localization/22.locale.ctype.toupper.cpp
stdcxx/trunk/tests/localization/22.locale.messages.cpp
stdcxx/trunk/tests/numerics/26.class.gslice.cpp
stdcxx/trunk/tests/src/23.containers.cpp
stdcxx/trunk/tests/src/ctype.cpp
stdcxx/trunk/tests/src/locale.cpp
stdcxx/trunk/tests/src/opt_lines.cpp
stdcxx/trunk/util/aliases.cpp
stdcxx/trunk/util/def.h
stdcxx/trunk/util/scanner.cpp
stdcxx/trunk/util/scanner.h
Modified: stdcxx/trunk/etc/config/src/EMPTY_MEM_INITIALIZER.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/etc/config/src/EMPTY_MEM_INITIALIZER.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/etc/config/src/EMPTY_MEM_INITIALIZER.cpp (original)
+++ stdcxx/trunk/etc/config/src/EMPTY_MEM_INITIALIZER.cpp Thu Mar 27 08:52:44
2008
@@ -55,8 +55,8 @@
// member must be default-initialized (zeroed out)
for (int i = 0; i != sizeof s; ++i)
- if (*p)
- return 0;
+ if (*p)
+ return 0;
return 1;
}
Modified: stdcxx/trunk/etc/config/src/UNAME.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/etc/config/src/UNAME.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/etc/config/src/UNAME.cpp (original)
+++ stdcxx/trunk/etc/config/src/UNAME.cpp Thu Mar 27 08:52:44 2008
@@ -97,35 +97,35 @@
{
static const char* const files[] = {
// Debian
- "/etc/debian_release", // see also /etc/debian_version?
+ "/etc/debian_release", // see also /etc/debian_version?
// Fedora
- "/etc/fedora-release",
+ "/etc/fedora-release",
// Gentoo
- "/etc/gentoo-release",
+ "/etc/gentoo-release",
// Novell SUSE
- "/etc/SuSE-release",
+ "/etc/SuSE-release",
// Red Hat
- "/etc/redhat-release", // see also /etc/redhat_version?
+ "/etc/redhat-release", // see also /etc/redhat_version?
// Slackware
- "/etc/slackware-release", // see also /etc/slackware-version?
+ "/etc/slackware-release", // see also /etc/slackware-version?
// Mandrake
- "/etc/mandrake-release",
+ "/etc/mandrake-release",
// Mandriva
"/etc/mandriva-release",
// MEPIS Linux
"/etc/mepis-release",
// Sun JDS
- "/etc/sun-release",
+ "/etc/sun-release",
// Solaris/SPARC
- "/etc/release",
+ "/etc/release",
// Turbo Linux
"/etc/turbolinux-release",
// UnitedLinux
- "/etc/UnitedLinux-release",
+ "/etc/UnitedLinux-release",
// Ubuntu
- "/etc/lsb-release",
+ "/etc/lsb-release",
// Yellow Dog
- "/etc/yellowdog-release",
+ "/etc/yellowdog-release",
////////////////////////////////////////////////////
// Last entry must be 0
Modified: stdcxx/trunk/examples/manual/bitset.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/bitset.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/bitset.cpp (original)
+++ stdcxx/trunk/examples/manual/bitset.cpp Thu Mar 27 08:52:44 2008
@@ -41,13 +41,13 @@
// Write bitset to the standard output.
std::cout << " 4....:....3....:....2....:....1....:....0\n"
- << "b = 5: " << b << '\n';
+ << "b = 5: " << b << '\n';
// Invert the bitset.
b = ~b;
std::cout << "b = ~b: " << b << '\n'
- << "b <<= " << b.count () << ": ";
+ << "b <<= " << b.count () << ": ";
// Shift the bitset left by the number of bits set.
b <<= b.count ();
Modified: stdcxx/trunk/examples/manual/codecvt.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/codecvt.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/codecvt.cpp (original)
+++ stdcxx/trunk/examples/manual/codecvt.cpp Thu Mar 27 08:52:44 2008
@@ -67,7 +67,7 @@
// convert the buffer
cdcvt.in (state, ins.c_str (), ins.c_str () + ins.length (), const_in_next,
&outs [0], &outs [0] + outs.length (), out_next);
-
+
std::cout << "After in:\n"
<< ins << '\n'
<< ins2 << '\n'
@@ -79,7 +79,7 @@
// Finally, convert back to the original codeset
cdcvt.out (state, outs.c_str (), outs.c_str () + outs.length (),
const_out_next, &ins [0], &ins [0] + ins.length (), in_next);
-
+
std::cout << "After out:\n"
<< ins << '\n'
<< ins2 << '\n'
Modified: stdcxx/trunk/examples/manual/codecvt1.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/codecvt1.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/codecvt1.cpp (original)
+++ stdcxx/trunk/examples/manual/codecvt1.cpp Thu Mar 27 08:52:44 2008
@@ -38,7 +38,7 @@
#include <examples.h>
-#define TMP_BUFFER_SIZE 1024
+#define TMP_BUFFER_SIZE 1024
// Japanese week days (short/abbreviated and long/normal form) in EUC-JP,
// Shift_JIS and UTF-8 encodings;
Modified: stdcxx/trunk/examples/manual/generate.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/generate.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/generate.cpp (original)
+++ stdcxx/trunk/examples/manual/generate.cpp Thu Mar 27 08:52:44 2008
@@ -30,7 +30,7 @@
#include <algorithm> // for generate, generate_n
#include <iostream> // for cout, endl
#include <iterator> // for ostream_iterator
-#include <vector> // for vector
+#include <vector> // for vector
#include <examples.h>
Modified: stdcxx/trunk/examples/manual/ifstream.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/ifstream.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/ifstream.cpp (original)
+++ stdcxx/trunk/examples/manual/ifstream.cpp Thu Mar 27 08:52:44 2008
@@ -69,8 +69,8 @@
std::cout << '\n';
- // clear stream state, failbit | eofbit set by last call to get ()
- in.clear ();
+ // clear stream state, failbit | eofbit set by last call to get ()
+ in.clear ();
// move back to the beginning of the file
in.seekg (0);
@@ -92,8 +92,8 @@
std::cout << '\n';
- // clear the stream state
- in.clear ();
+ // clear the stream state
+ in.clear ();
// output the base info before each integer
out << std::showbase;
@@ -117,8 +117,8 @@
// output the entire file
std::cout << in.rdbuf () << '\n';
- // clear the stream state
- in.clear ();
+ // clear the stream state
+ in.clear ();
// seek the input sequence to pos
in.seekg (pos);
Modified: stdcxx/trunk/examples/manual/istringstream.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/istringstream.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/istringstream.cpp (original)
+++ stdcxx/trunk/examples/manual/istringstream.cpp Thu Mar 27 08:52:44 2008
@@ -68,8 +68,8 @@
std::wcout << std::endl;
- // clear stream state, failbit | eofbit set by last call to get ()
- in.clear ();
+ // clear stream state, failbit | eofbit set by last call to get ()
+ in.clear ();
// move back to the beginning of the stream
in.seekg (0);
@@ -91,9 +91,9 @@
std::wcout << std::endl;
- // clear flags, last in >> buf set fail bit
+ // clear flags, last in >> buf set fail bit
// because of a newline at end of string
- in.clear ();
+ in.clear ();
// output the base info before each integer
out << std::showbase;
@@ -117,8 +117,8 @@
// output the entire stream
std::wcout << in.rdbuf () << std::endl;
- // clear the flags
- in.clear ();
+ // clear the flags
+ in.clear ();
// seek the input sequence to pos
in.seekg (pos);
Modified: stdcxx/trunk/examples/manual/lex_compare.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/lex_compare.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/lex_compare.cpp (original)
+++ stdcxx/trunk/examples/manual/lex_compare.cpp Thu Mar 27 08:52:44 2008
@@ -39,7 +39,7 @@
{
typedef std::vector<int, std::allocator<int> > Vector;
- const Vector::value_type d1[] = { 1, 3, 5, 32, 64 };
+ const Vector::value_type d1[] = { 1, 3, 5, 32, 64 };
const Vector::value_type d2[] = { 1, 3, 2, 43, 56 };
// Create vectors.
Modified: stdcxx/trunk/examples/manual/max_elem.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/max_elem.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/max_elem.cpp (original)
+++ stdcxx/trunk/examples/manual/max_elem.cpp Thu Mar 27 08:52:44 2008
@@ -37,9 +37,9 @@
typedef std::vector<int, std::allocator<int> > Vector;
typedef Vector::iterator Iterator;
- const Vector::value_type d1[] = { 1, 3, 5, 32, 64 };
+ const Vector::value_type d1[] = { 1, 3, 5, 32, 64 };
// Set up vector.
- Vector v1(d1 + 0, d1 + sizeof d1 / sizeof *d1);
+ Vector v1(d1 + 0, d1 + sizeof d1 / sizeof *d1);
// Find the largest element in the vector.
Iterator it1 = std::max_element (v1.begin (), v1.end ());
Modified: stdcxx/trunk/examples/manual/memfunref.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/memfunref.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/memfunref.cpp (original)
+++ stdcxx/trunk/examples/manual/memfunref.cpp Thu Mar 27 08:52:44 2008
@@ -34,7 +34,7 @@
#include <examples.h>
#include <memfunref.h>
-typedef sublist<int> list_type;
+typedef sublist<int> list_type;
int main ()
{
Modified: stdcxx/trunk/examples/manual/merge.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/merge.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/merge.cpp (original)
+++ stdcxx/trunk/examples/manual/merge.cpp Thu Mar 27 08:52:44 2008
@@ -71,7 +71,7 @@
// Now use a comparator on v6.
mid = v6.begin ();
std::advance (mid, 4); // equivalent to mid += 4 but more generic
- std::inplace_merge (v6.begin (), mid, v6.end (), std::less<int>());
+ std::inplace_merge (v6.begin (), mid, v6.end (), std::less<int>());
// Merge v1 and v2 to empty vector using insert iterator.
std::merge (v1.begin (), v1.end (),
Modified: stdcxx/trunk/examples/manual/mismatch.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/mismatch.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/mismatch.cpp (original)
+++ stdcxx/trunk/examples/manual/mismatch.cpp Thu Mar 27 08:52:44 2008
@@ -52,7 +52,7 @@
// p1 will contain two iterators that point to the first pair of
// elements that are different between the two vectors.
std::pair<Iter, Iter> p1 =
- std::mismatch (vi1.begin (), vi1.end (), vi2.begin ());
+ std::mismatch (vi1.begin (), vi1.end (), vi2.begin ());
// Find the first two elements such that an element in the
// first vector is greater than the element in the second vector.
Modified: stdcxx/trunk/examples/manual/partition.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/partition.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/partition.cpp (original)
+++ stdcxx/trunk/examples/manual/partition.cpp Thu Mar 27 08:52:44 2008
@@ -34,8 +34,8 @@
#include <examples.h>
-typedef std::modulus<int> int_modulus;
-typedef std::binder2nd<int_modulus> bnd_modulus;
+typedef std::modulus<int> int_modulus;
+typedef std::binder2nd<int_modulus> bnd_modulus;
typedef std::unary_negate<bnd_modulus> is_even;
int main ()
Modified: stdcxx/trunk/examples/manual/remove.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/manual/remove.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/manual/remove.cpp (original)
+++ stdcxx/trunk/examples/manual/remove.cpp Thu Mar 27 08:52:44 2008
@@ -51,8 +51,8 @@
// };
-typedef std::greater<int> int_greater;
-typedef std::binder2nd<int_greater> bnd_greater;
+typedef std::greater<int> int_greater;
+typedef std::binder2nd<int_greater> bnd_greater;
int main ()
{
Modified: stdcxx/trunk/examples/tutorial/spell.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/examples/tutorial/spell.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/examples/tutorial/spell.cpp (original)
+++ stdcxx/trunk/examples/tutorial/spell.cpp Thu Mar 27 08:52:44 2008
@@ -44,7 +44,7 @@
typedef
std::istream_iterator<std::string,
char, std::char_traits<char>,
- std::ptrdiff_t> istrm_iter;
+ std::ptrdiff_t> istrm_iter;
void spellCheck (std::istream & dictionary, std::istream & text) {
Modified: stdcxx/trunk/include/loc/_moneypunct.h
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/include/loc/_moneypunct.h?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/include/loc/_moneypunct.h (original)
+++ stdcxx/trunk/include/loc/_moneypunct.h Thu Mar 27 08:52:44 2008
@@ -144,7 +144,7 @@
// 22.2.6.3.1, p6
virtual int do_frac_digits () const {
return _RWSTD_STATIC_CAST(int, _RWSTD_REINTERPRET_CAST (_RWSTD_SIZE_T,
- _C_get (this, _RW::__rw_fd)));
+ _C_get (this, _RW::__rw_fd)));
}
// 22.2.6.3.1, p7
Modified: stdcxx/trunk/include/loc/_num_get.h
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/include/loc/_num_get.h?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/include/loc/_num_get.h (original)
+++ stdcxx/trunk/include/loc/_num_get.h Thu Mar 27 08:52:44 2008
@@ -239,7 +239,7 @@
iter_type
_C_get (iter_type, iter_type, ios_base&,
- _RWSTD_IOSTATE&, int, void*) const;
+ _RWSTD_IOSTATE&, int, void*) const;
};
Modified: stdcxx/trunk/include/rw/_exception.h
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/include/rw/_exception.h?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/include/rw/_exception.h (original)
+++ stdcxx/trunk/include/rw/_exception.h Thu Mar 27 08:52:44 2008
@@ -59,7 +59,7 @@
} // namespace std
_RWSTD_NAMESPACE (__rw) {
-
+
// base exception class inherited by all other exceptions
class _RWSTD_EXPORT __rw_exception: public _STD::exception
{
Modified: stdcxx/trunk/include/rw/_tree.cc
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/include/rw/_tree.cc?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/include/rw/_tree.cc (original)
+++ stdcxx/trunk/include/rw/_tree.cc Thu Mar 27 08:52:44 2008
@@ -307,7 +307,7 @@
if (__dup) {
// allow insertion of duplicate keys
- __ret = _IterPair (_C_insert (__x, __y, __v), true);
+ __ret = _IterPair (_C_insert (__x, __y, __v), true);
return;
}
@@ -315,15 +315,15 @@
if (__right) {
if (__j == begin ()) {
__ret = _IterPair (_C_insert (__x, __y, __v), true);
- return;
- }
+ return;
+ }
--__j;
}
if (_C_cmp (_ITER_NODE (__j)->_C_key (), _KeyOf ()(__v)))
__ret = _IterPair (_C_insert (__x, __y, __v), true);
else
- __ret = _IterPair (__j, false);
+ __ret = _IterPair (__j, false);
}
Modified: stdcxx/trunk/include/rw/_tree.h
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/include/rw/_tree.h?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/include/rw/_tree.h (original)
+++ stdcxx/trunk/include/rw/_tree.h Thu Mar 27 08:52:44 2008
@@ -566,8 +566,8 @@
_STD::pair<iterator, bool>
insert (const value_type &__val, bool __dup) {
- _STD::pair<iterator, bool> __ret;
- return _C_insert (__val, __ret, __dup), __ret;
+ _STD::pair<iterator, bool> __ret;
+ return _C_insert (__val, __ret, __dup), __ret;
}
iterator insert (iterator, const value_type&, bool);
Modified: stdcxx/trunk/include/set
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/include/set?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/include/set (original)
+++ stdcxx/trunk/include/set Thu Mar 27 08:52:44 2008
@@ -169,7 +169,7 @@
#if !defined (_MSC_VER) || _MSC_VER > 1300
iterator insert (iterator __it, const value_type& __x) {
- return _C_rep.insert (__it, __x, false);
+ return _C_rep.insert (__it, __x, false);
}
void erase (iterator __it) {
@@ -184,20 +184,20 @@
// working around MSVC bugs
iterator insert (iterator __it, const value_type& __x) {
- typedef _TYPENAME __rep_type::iterator _Iterator;
+ typedef _TYPENAME __rep_type::iterator _Iterator;
return _RWSTD_REINTERPRET_CAST (iterator&, _C_rep.insert (
- _RWSTD_REINTERPRET_CAST (_Iterator&, __it), __x, false));
+ _RWSTD_REINTERPRET_CAST (_Iterator&, __it), __x, false));
}
void erase (iterator __it) {
- typedef _TYPENAME __rep_type::iterator _Iterator;
+ typedef _TYPENAME __rep_type::iterator _Iterator;
_C_rep.erase (_RWSTD_REINTERPRET_CAST (_Iterator&, __it));
}
void erase (iterator __first, iterator __last) {
- typedef _TYPENAME __rep_type::iterator _Iterator;
+ typedef _TYPENAME __rep_type::iterator _Iterator;
_C_rep.erase (_RWSTD_REINTERPRET_CAST (_Iterator&, __first),
- _RWSTD_REINTERPRET_CAST (_Iterator&, __last));
+ _RWSTD_REINTERPRET_CAST (_Iterator&, __last));
}
#endif
Modified: stdcxx/trunk/include/sstream.cc
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/include/sstream.cc?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/include/sstream.cc (original)
+++ stdcxx/trunk/include/sstream.cc Thu Mar 27 08:52:44 2008
@@ -103,7 +103,7 @@
if (this->_C_bufsize < __bufsize) {
// requested capacity is greater than the current capacity
// allocate a new buffer of sufficient size
- const _RWSTD_STREAMSIZE __ratio =
+ const _RWSTD_STREAMSIZE __ratio =
_RWSTD_STREAMSIZE ( (_RWSTD_NEW_CAPACITY_RATIO << 10)
/ _RWSTD_RATIO_DIVIDER);
Modified: stdcxx/trunk/src/exception.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/src/exception.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/src/exception.cpp (original)
+++ stdcxx/trunk/src/exception.cpp Thu Mar 27 08:52:44 2008
@@ -498,7 +498,7 @@
// HP-UX and Windows are known to return a negative value for
// buffer overflow.
- // On IRIX and Tru64 UNIX on overflow the function returns
+ // On IRIX and Tru64 UNIX on overflow the function returns
// the number of bytes actually written to the buffer which
// makes it indistinguishable from a successful return value
// for a completely full buffer.
Modified: stdcxx/trunk/src/ia64/atomic.s
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/src/ia64/atomic.s?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/src/ia64/atomic.s (original)
+++ stdcxx/trunk/src/ia64/atomic.s Thu Mar 27 08:52:44 2008
@@ -28,7 +28,7 @@
.text
//.pred.safe_across_calls p1-p5,p16-p63
- .psr abi32
+ .psr abi32
.psr msb
////////////////////////////////////////////////////////////////////////////
@@ -46,8 +46,8 @@
.prologue
.body
// .mfb
- addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
- ;;
+ addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
+ ;;
xchg1 r8 = [r9], r33
nop 0
br.ret.sptk.many b0
@@ -70,8 +70,8 @@
.body
// .mmb
mf
- addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
- ;;
+ addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
+ ;;
ld1.acq r15 = [r9]
nop 0
;;
@@ -108,8 +108,8 @@
.prologue
.body
// .mfb
- addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
- ;;
+ addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
+ ;;
xchg2 r8 = [r9], r33
nop 0
br.ret.sptk.many b0
@@ -132,8 +132,8 @@
.body
// .mmb
mf
- addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
- ;;
+ addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
+ ;;
ld2.acq r15 = [r9]
nop 0
;;
@@ -171,8 +171,8 @@
.body
// .mfb
- addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
- ;;
+ addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
+ ;;
xchg4 r8 = [r9], r33
nop 0
br.ret.sptk.many b0
@@ -195,8 +195,8 @@
.body
// .mmb
mf
- addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
- ;;
+ addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
+ ;;
ld4.acq r15 = [r9]
nop 0
;;
@@ -234,7 +234,7 @@
.body
// .mfb
- addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
+ addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
;;
xchg8 r8 = [r9], r33
nop 0
@@ -258,7 +258,7 @@
.body
// .mmb
mf
- addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
+ addp4 r9 = 0, r32 // Needed to be able to dereference a 32 bit pointer
;;
ld8.acq r15 = [r9]
nop 0
Modified: stdcxx/trunk/src/iostream.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/src/iostream.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/src/iostream.cpp (original)
+++ stdcxx/trunk/src/iostream.cpp Thu Mar 27 08:52:44 2008
@@ -226,7 +226,7 @@
_RWSTD_NAMESPACE (std) {
-
+
ios_base::Init::Init ()
{
// only the first thread initializes
Modified: stdcxx/trunk/src/iso2022.h
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/src/iso2022.h?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/src/iso2022.h (original)
+++ stdcxx/trunk/src/iso2022.h Thu Mar 27 08:52:44 2008
@@ -42,10 +42,10 @@
enum encoding_type
{
stateless,
- iso2022_jp, /* stateful ISO-2022-JP encoding */
+ iso2022_jp, /* stateful ISO-2022-JP encoding */
iso2022_jp2, /* stateful ISO-2022-JP2 encoding */
- iso2022_kr, /* stateful ISO-2022-KR encoding */
- iso2022_cn /* stateful ISO-2022-CN encoding */
+ iso2022_kr, /* stateful ISO-2022-KR encoding */
+ iso2022_cn /* stateful ISO-2022-CN encoding */
};
typedef enum encoding_type encoding_type_t;
Modified: stdcxx/trunk/src/messages.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/src/messages.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/src/messages.cpp (original)
+++ stdcxx/trunk/src/messages.cpp Thu Mar 27 08:52:44 2008
@@ -102,9 +102,9 @@
if (0 == init) {
for (size_t i = 0; i < catalog_bufsize; ++i) {
- catalogs [i].catd = _RWSTD_BAD_CATD;
- }
- init = 1;
+ catalogs [i].catd = _RWSTD_BAD_CATD;
+ }
+ init = 1;
}
if (-1 == cat) {
@@ -116,57 +116,57 @@
if (n_catalogs == catalog_bufsize) {
// reallocate buffer of facet pointers
- __rw_open_cat_data* const tmp =
- new __rw_open_cat_data[n_catalogs * 2];
-
- memcpy (tmp, catalogs, n_catalogs * sizeof *tmp);
-
- if (catalogs != catalog_buf)
- delete[] catalogs;
-
- catalogs = tmp;
- catalog_bufsize *= 2;
-
- for (size_t i = n_catalogs; i < catalog_bufsize; ++i) {
- catalogs [i].catd = _RWSTD_BAD_CATD;
- }
-
- cat = int (n_catalogs);
- memcpy (&catalogs [cat].loc, &pcat_data->loc,
- sizeof (_STD::locale));
-
- catalogs [cat].catd = pcat_data->catd;
-
- if (size_t (cat) > largest_cat)
- largest_cat = size_t (cat);
-
- ++n_catalogs;
- }
- else {
- // find the first open slot and use it.
- cat = 0;
- while (catalogs [cat].catd != _RWSTD_BAD_CATD) {
- ++cat;
- }
-
- if (size_t (cat) > largest_cat)
- largest_cat = size_t (cat);
-
- memcpy (&catalogs [cat].loc, &pcat_data->loc,
- sizeof (_STD::locale));
-
- catalogs [cat].catd = pcat_data->catd;
- ++n_catalogs;
- }
- }
+ __rw_open_cat_data* const tmp =
+ new __rw_open_cat_data[n_catalogs * 2];
+
+ memcpy (tmp, catalogs, n_catalogs * sizeof *tmp);
+
+ if (catalogs != catalog_buf)
+ delete[] catalogs;
+
+ catalogs = tmp;
+ catalog_bufsize *= 2;
+
+ for (size_t i = n_catalogs; i < catalog_bufsize; ++i) {
+ catalogs [i].catd = _RWSTD_BAD_CATD;
+ }
+
+ cat = int (n_catalogs);
+ memcpy (&catalogs [cat].loc, &pcat_data->loc,
+ sizeof (_STD::locale));
+
+ catalogs [cat].catd = pcat_data->catd;
+
+ if (size_t (cat) > largest_cat)
+ largest_cat = size_t (cat);
+
+ ++n_catalogs;
+ }
+ else {
+ // find the first open slot and use it.
+ cat = 0;
+ while (catalogs [cat].catd != _RWSTD_BAD_CATD) {
+ ++cat;
+ }
+
+ if (size_t (cat) > largest_cat)
+ largest_cat = size_t (cat);
+
+ memcpy (&catalogs [cat].loc, &pcat_data->loc,
+ sizeof (_STD::locale));
+
+ catalogs [cat].catd = pcat_data->catd;
+ ++n_catalogs;
+ }
+ }
}
else {
if (0 == pcat_data) {
- // find struct and return it
- if (size_t (cat) < catalog_bufsize)
+ // find struct and return it
+ if (size_t (cat) < catalog_bufsize)
return catalogs + cat;
- return 0;
+ return 0;
}
// initialize the struct to an invalid state
@@ -191,7 +191,7 @@
// second half of the statically allocated repository, copy
// the open catalogs back into the statically allocated
// repository.
-
+
catalog_bufsize = bufsize;
memcpy (catalog_buf, catalogs,
@@ -246,7 +246,7 @@
const char dflt[] = "";
- const nl_catd catd = pcat_data->catd;
+ const nl_catd catd = pcat_data->catd;
const char* const text = catgets (catd, set_num, msg_num, dflt);
Modified: stdcxx/trunk/src/valarray.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/src/valarray.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/src/valarray.cpp (original)
+++ stdcxx/trunk/src/valarray.cpp Thu Mar 27 08:52:44 2008
@@ -40,9 +40,9 @@
_RWSTD_SIZE_T gslice::next_ind ()
{
_RWSTD_SIZE_T __n = _C_length.size ();
-
+
while (__n && _C_r_length [__n - 1] == _C_length [__n - 1] - 1)
- --__n;
+ --__n;
if (0 == __n) {
_C_reset = true;
Modified: stdcxx/trunk/tests/localization/22.locale.ctype.tolower.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.ctype.tolower.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.ctype.tolower.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.ctype.tolower.cpp Thu Mar 27
08:52:44 2008
@@ -428,7 +428,7 @@
"(<U0063>,<U0043>);(<U1000>,<U1001>)\n"
"tolower (<U0041>,<U0061>);(<U0042>,<U0062>);"
"(<U0043>,<U0063>);(<U1001>,<U1000>)\n"
- "END LC_CTYPE\n"
+ "END LC_CTYPE\n"
};
//invoke rw_create_locale to build a locale to test with
Modified: stdcxx/trunk/tests/localization/22.locale.ctype.toupper.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.ctype.toupper.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.ctype.toupper.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.ctype.toupper.cpp Thu Mar 27
08:52:44 2008
@@ -429,7 +429,7 @@
"(<U0063>,<U0043>);(<U1000>,<U1001>)\n"
"tolower (<U0041>,<U0061>);(<U0042>,<U0062>);"
"(<U0043>,<U0063>);(<U1001>,<U1000>)\n"
- "END LC_CTYPE\n"
+ "END LC_CTYPE\n"
};
//invoke rw_create_locale to build a locale to test with
Modified: stdcxx/trunk/tests/localization/22.locale.messages.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/tests/localization/22.locale.messages.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/tests/localization/22.locale.messages.cpp (original)
+++ stdcxx/trunk/tests/localization/22.locale.messages.cpp Thu Mar 27 08:52:44
2008
@@ -821,7 +821,7 @@
#ifdef _RWSTD_OS_AIX
// must do this so that NLSPATH lookup works correctly for both
- // the C and POSIX locales.
+ // the C and POSIX locales.
const int p = rw_putenv ("LC__FASTMSG=false");
rw_note (!p, 0, __LINE__, "failed to set LC__FASTMSG");
Modified: stdcxx/trunk/tests/numerics/26.class.gslice.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.class.gslice.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.class.gslice.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.class.gslice.cpp Thu Mar 27 08:52:44 2008
@@ -93,7 +93,7 @@
}
while (inx && factors [inx - 1] == asizes [inx - 1] - 1)
- --inx;
+ --inx;
if (0 == inx) {
factors = 0;
Modified: stdcxx/trunk/tests/src/23.containers.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/23.containers.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/23.containers.cpp (original)
+++ stdcxx/trunk/tests/src/23.containers.cpp Thu Mar 27 08:52:44 2008
@@ -533,15 +533,15 @@
{
// temporary empty
- _RWSTD_UNUSED (pbuf);
- _RWSTD_UNUSED (pbufsize);
- _RWSTD_UNUSED (which);
- _RWSTD_UNUSED (self);
- _RWSTD_UNUSED (str);
- _RWSTD_UNUSED (str_len);
- _RWSTD_UNUSED (arg);
- _RWSTD_UNUSED (arg_len);
- _RWSTD_UNUSED (tcase);
+ _RWSTD_UNUSED (pbuf);
+ _RWSTD_UNUSED (pbufsize);
+ _RWSTD_UNUSED (which);
+ _RWSTD_UNUSED (self);
+ _RWSTD_UNUSED (str);
+ _RWSTD_UNUSED (str_len);
+ _RWSTD_UNUSED (arg);
+ _RWSTD_UNUSED (arg_len);
+ _RWSTD_UNUSED (tcase);
}
/**************************************************************************/
@@ -562,15 +562,15 @@
{
// temporary empty
- _RWSTD_UNUSED (pbuf);
- _RWSTD_UNUSED (pbufsize);
- _RWSTD_UNUSED (which);
- _RWSTD_UNUSED (self);
- _RWSTD_UNUSED (str);
- _RWSTD_UNUSED (str_len);
- _RWSTD_UNUSED (arg);
- _RWSTD_UNUSED (arg_len);
- _RWSTD_UNUSED (tcase);
+ _RWSTD_UNUSED (pbuf);
+ _RWSTD_UNUSED (pbufsize);
+ _RWSTD_UNUSED (which);
+ _RWSTD_UNUSED (self);
+ _RWSTD_UNUSED (str);
+ _RWSTD_UNUSED (str_len);
+ _RWSTD_UNUSED (arg);
+ _RWSTD_UNUSED (arg_len);
+ _RWSTD_UNUSED (tcase);
}
/**************************************************************************/
@@ -591,15 +591,15 @@
{
// temporary empty
- _RWSTD_UNUSED (pbuf);
- _RWSTD_UNUSED (pbufsize);
- _RWSTD_UNUSED (which);
- _RWSTD_UNUSED (self);
- _RWSTD_UNUSED (str);
- _RWSTD_UNUSED (str_len);
- _RWSTD_UNUSED (arg);
- _RWSTD_UNUSED (arg_len);
- _RWSTD_UNUSED (tcase);
+ _RWSTD_UNUSED (pbuf);
+ _RWSTD_UNUSED (pbufsize);
+ _RWSTD_UNUSED (which);
+ _RWSTD_UNUSED (self);
+ _RWSTD_UNUSED (str);
+ _RWSTD_UNUSED (str_len);
+ _RWSTD_UNUSED (arg);
+ _RWSTD_UNUSED (arg_len);
+ _RWSTD_UNUSED (tcase);
}
/**************************************************************************/
@@ -620,15 +620,15 @@
{
// temporary empty
- _RWSTD_UNUSED (pbuf);
- _RWSTD_UNUSED (pbufsize);
- _RWSTD_UNUSED (which);
- _RWSTD_UNUSED (self);
- _RWSTD_UNUSED (str);
- _RWSTD_UNUSED (str_len);
- _RWSTD_UNUSED (arg);
- _RWSTD_UNUSED (arg_len);
- _RWSTD_UNUSED (tcase);
+ _RWSTD_UNUSED (pbuf);
+ _RWSTD_UNUSED (pbufsize);
+ _RWSTD_UNUSED (which);
+ _RWSTD_UNUSED (self);
+ _RWSTD_UNUSED (str);
+ _RWSTD_UNUSED (str_len);
+ _RWSTD_UNUSED (arg);
+ _RWSTD_UNUSED (arg_len);
+ _RWSTD_UNUSED (tcase);
}
/**************************************************************************/
Modified: stdcxx/trunk/tests/src/ctype.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/ctype.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/ctype.cpp (original)
+++ stdcxx/trunk/tests/src/ctype.cpp Thu Mar 27 08:52:44 2008
@@ -43,10 +43,10 @@
static void
_rw_throw (const char *file, int line, const char *fmt, ...)
{
- _RWSTD_UNUSED (file);
- _RWSTD_UNUSED (line);
+ _RWSTD_UNUSED (file);
+ _RWSTD_UNUSED (line);
- struct Exception: UserCtypeBase::Exception {
+ struct Exception: UserCtypeBase::Exception {
char what_ [256];
/* virtual */ const char* what () const {
Modified: stdcxx/trunk/tests/src/locale.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/locale.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/locale.cpp (original)
+++ stdcxx/trunk/tests/src/locale.cpp Thu Mar 27 08:52:44 2008
@@ -641,7 +641,7 @@
// determine whether the wide character is valid
// and if so, the length of the multibyte character
// that corresponds to it
- const wchar_t wc = wchar_t (i);
+ const wchar_t wc = wchar_t (i);
const int len = wctomb (tmp, wc);
if (nbytes == 0 && 0 < len || nbytes != 0 && nbytes == len) {
Modified: stdcxx/trunk/tests/src/opt_lines.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/opt_lines.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/opt_lines.cpp (original)
+++ stdcxx/trunk/tests/src/opt_lines.cpp Thu Mar 27 08:52:44 2008
@@ -93,7 +93,7 @@
static int
_rw_enable_line (int argc, char *argv[], int flags)
{
- _RWSTD_UNUSED (argc);
+ _RWSTD_UNUSED (argc);
char *parg = strchr (argv [0], '=');
assert (0 != parg);
Modified: stdcxx/trunk/util/aliases.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/util/aliases.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/util/aliases.cpp (original)
+++ stdcxx/trunk/util/aliases.cpp Thu Mar 27 08:52:44 2008
@@ -601,8 +601,8 @@
const int ret = std::system (cmd);
if (ret)
- issue_diag (W_NOTSUP, false, 0, "call to system(\"%s\") failed: %s\n",
- cmd, std::strerror (errno));
+ issue_diag (W_NOTSUP, false, 0, "call to system(\"%s\") failed: %s\n",
+ cmd, std::strerror (errno));
// open file containing the list of installed locales
std::FILE *f = std::fopen (fname, "r");
Modified: stdcxx/trunk/util/def.h
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/util/def.h?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/util/def.h (original)
+++ stdcxx/trunk/util/def.h Thu Mar 27 08:52:44 2008
@@ -92,12 +92,12 @@
// was the content of the locale definition file scanned ahead
bool scan_ahead_;
- typedef Scanner::token_t token_t;
+ typedef Scanner::token_t token_t;
typedef std::pair<token_t,token_t> token_pair_t;
- typedef std::list<token_t> token_list_t;
+ typedef std::list<token_t> token_list_t;
typedef std::pair<token_t,token_list_t> collate_entry_t;
typedef std::pair<token_t,token_list_t> collate_elem_t;
- typedef std::list<collate_entry_t> collate_entry_list_t;
+ typedef std::list<collate_entry_t> collate_entry_list_t;
struct collate_section_t;
struct collate_section_t {
@@ -401,9 +401,9 @@
typedef std::map<wchar_t,std::list<std::string> > xlit_map_t;
typedef std::map<wchar_t, unsigned int> xlit_data_offset_map_t;
typedef std::map<unsigned int,xlit_offset_table_t> xlit_table_map_t;
- xlit_map_t xlit_map_;
- xlit_data_offset_map_t xlit_data_offset_map_;
- xlit_table_map_t xlit_table_map_;
+ xlit_map_t xlit_map_;
+ xlit_data_offset_map_t xlit_data_offset_map_;
+ xlit_table_map_t xlit_table_map_;
// the collate_info_t struct contains information concerning the collation
// of each character
Modified: stdcxx/trunk/util/scanner.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/util/scanner.cpp?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/util/scanner.cpp (original)
+++ stdcxx/trunk/util/scanner.cpp Thu Mar 27 08:52:44 2008
@@ -45,8 +45,8 @@
{
ScannerContext (const char*, char = '#', char = '\\');
- std::ifstream file; // file stream object
- std::string filename; // filename
+ std::ifstream file; // file stream object
+ std::string filename; // filename
// comment and escape for current file
char comment_char;
Modified: stdcxx/trunk/util/scanner.h
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/util/scanner.h?rev=641861&r1=641860&r2=641861&view=diff
==============================================================================
--- stdcxx/trunk/util/scanner.h (original)
+++ stdcxx/trunk/util/scanner.h Thu Mar 27 08:52:44 2008
@@ -191,7 +191,7 @@
virtual ~Scanner();
// public interface
- token_t next_token ();
+ token_t next_token ();
void open (std::string, char = '#', char = '\\');
