aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--butl/path2
-rw-r--r--tests/path/driver.cxx18
2 files changed, 10 insertions, 10 deletions
diff --git a/butl/path b/butl/path
index 5f6d063..3f0d567 100644
--- a/butl/path
+++ b/butl/path
@@ -406,7 +406,7 @@ namespace butl
}
iterator
- operator++ (int) const {iterator r (*this); return ++r;}
+ operator++ (int) {iterator r (*this); operator++(); return r;}
string_type operator* () const
{
diff --git a/tests/path/driver.cxx b/tests/path/driver.cxx
index 302968d..30933ea 100644
--- a/tests/path/driver.cxx
+++ b/tests/path/driver.cxx
@@ -130,28 +130,28 @@ main ()
{
path p ("foo");
assert (path (p.begin (), p.end ()) == p);
- assert (path (p.begin ()++, p.end ()) == path ());
+ assert (path (++p.begin (), p.end ()) == path ());
}
{
path p ("foo/bar");
assert (path (p.begin (), p.end ()) == p);
- assert (path (p.begin ()++, p.end ()) == path ("bar"));
- assert (path (p.begin (), p.begin ()++) == path ("foo"));
+ assert (path (++p.begin (), p.end ()) == path ("bar"));
+ assert (path (p.begin (), ++p.begin ()) == path ("foo"));
}
{
path p ("/foo/bar");
assert (path (p.begin (), p.end ()) == p);
- assert (path (p.begin ()++, p.end ()) == path ("foo/bar"));
- assert (path ((p.begin ()++)++, p.end ()) == path ("bar"));
- assert (path (p.begin (), p.begin ()++) == path ("/"));
- assert (path (p.begin ()++, (p.begin ()++)++) == path ("foo"));
- assert (path ((p.begin ()++)++, ((p.begin ()++)++)++) == path ("bar"));
+ assert (path (++p.begin (), p.end ()) == path ("foo/bar"));
+ assert (path (++(++p.begin ()), p.end ()) == path ("bar"));
+ assert (path (p.begin (), ++p.begin ()) == path ("/"));
+ assert (path (++p.begin (), ++(++p.begin ())) == path ("foo"));
+ assert (path (++(++p.begin ()), ++(++(++p.begin ()))) == path ("bar"));
}
#ifndef _WIN32
{
path p ("/");
assert (path (p.begin (), p.end ()) == p);
- assert (path (p.begin ()++, p.end ()) == path ());
+ assert (path (++p.begin (), p.end ()) == path ());
}
#endif