summaryrefslogtreecommitdiff
path: root/boost/filesystem
diff options
context:
space:
mode:
Diffstat (limited to 'boost/filesystem')
-rw-r--r--boost/filesystem/operations.hpp15
-rw-r--r--boost/filesystem/path.hpp33
-rw-r--r--boost/filesystem/path_traits.hpp4
3 files changed, 27 insertions, 25 deletions
diff --git a/boost/filesystem/operations.hpp b/boost/filesystem/operations.hpp
index d677084..f0e09b9 100644
--- a/boost/filesystem/operations.hpp
+++ b/boost/filesystem/operations.hpp
@@ -227,7 +227,7 @@ namespace boost
set_gid_on_exe = 02000, // S_ISGID, Set-group-ID on execution
sticky_bit = 01000, // S_ISVTX,
// (POSIX XSI) On directories, restricted deletion flag
- // (V7) 'sticky bit': save swapped text even after use
+ // (V7) 'sticky bit': save swapped text even after use
// (SunOS) On non-directories: don't cache this file
// (SVID-v4.2) On directories: restricted deletion flag
// Also see http://en.wikipedia.org/wiki/Sticky_bit
@@ -843,9 +843,10 @@ namespace detail
bool equal(const directory_iterator& rhs) const
{ return m_imp == rhs.m_imp; }
- };
- // enable C++11 range-base for statement use ---------------------------------------//
+ }; // directory_iterator
+
+ // enable directory_iterator C++11 range-base for statement use --------------------//
// begin() and end() are only used by a range-based for statement in the context of
// auto - thus the top-level const is stripped - so returning const is harmless and
@@ -855,7 +856,7 @@ namespace detail
inline
directory_iterator end(const directory_iterator&) {return directory_iterator();}
- // enable BOOST_FOREACH ------------------------------------------------------------//
+ // enable directory_iterator BOOST_FOREACH -----------------------------------------//
inline
directory_iterator& range_begin(directory_iterator& iter) {return iter;}
@@ -1165,9 +1166,9 @@ namespace filesystem
bool equal(const recursive_directory_iterator& rhs) const
{ return m_imp == rhs.m_imp; }
- };
+ }; // recursive directory iterator
- // enable C++11 range-base for statement use ---------------------------------------//
+ // enable recursive directory iterator C++11 range-base for statement use ----------//
// begin() and end() are only used by a range-based for statement in the context of
// auto - thus the top-level const is stripped - so returning const is harmless and
@@ -1179,7 +1180,7 @@ namespace filesystem
recursive_directory_iterator end(const recursive_directory_iterator&)
{return recursive_directory_iterator();}
- // enable BOOST_FOREACH ------------------------------------------------------------//
+ // enable recursive directory iterator BOOST_FOREACH -------------------------------//
inline
recursive_directory_iterator& range_begin(recursive_directory_iterator& iter)
diff --git a/boost/filesystem/path.hpp b/boost/filesystem/path.hpp
index 37f39d0..7ae4d2f 100644
--- a/boost/filesystem/path.hpp
+++ b/boost/filesystem/path.hpp
@@ -158,8 +158,8 @@ namespace filesystem
{
// convert requires contiguous string, so copy
std::basic_string<typename std::iterator_traits<InputIterator>::value_type>
- s(begin, end);
- path_traits::convert(s.c_str(), s.c_str()+s.size(), m_pathname);
+ seq(begin, end);
+ path_traits::convert(seq.c_str(), seq.c_str()+seq.size(), m_pathname);
}
}
@@ -170,8 +170,8 @@ namespace filesystem
{
// convert requires contiguous string, so copy
std::basic_string<typename std::iterator_traits<InputIterator>::value_type>
- s(begin, end);
- path_traits::convert(s.c_str(), s.c_str()+s.size(), m_pathname, cvt);
+ seq(begin, end);
+ path_traits::convert(seq.c_str(), seq.c_str()+seq.size(), m_pathname, cvt);
}
}
@@ -219,8 +219,8 @@ namespace filesystem
if (begin != end)
{
std::basic_string<typename std::iterator_traits<InputIterator>::value_type>
- s(begin, end);
- path_traits::convert(s.c_str(), s.c_str()+s.size(), m_pathname);
+ seq(begin, end);
+ path_traits::convert(seq.c_str(), seq.c_str()+seq.size(), m_pathname);
}
return *this;
}
@@ -232,8 +232,8 @@ namespace filesystem
if (begin != end)
{
std::basic_string<typename std::iterator_traits<InputIterator>::value_type>
- s(begin, end);
- path_traits::convert(s.c_str(), s.c_str()+s.size(), m_pathname, cvt);
+ seq(begin, end);
+ path_traits::convert(seq.c_str(), seq.c_str()+seq.size(), m_pathname, cvt);
}
return *this;
}
@@ -286,8 +286,8 @@ namespace filesystem
if (begin == end)
return *this;
std::basic_string<typename std::iterator_traits<InputIterator>::value_type>
- s(begin, end);
- path_traits::convert(s.c_str(), s.c_str()+s.size(), m_pathname);
+ seq(begin, end);
+ path_traits::convert(seq.c_str(), seq.c_str()+seq.size(), m_pathname);
return *this;
}
@@ -297,8 +297,8 @@ namespace filesystem
if (begin == end)
return *this;
std::basic_string<typename std::iterator_traits<InputIterator>::value_type>
- s(begin, end);
- path_traits::convert(s.c_str(), s.c_str()+s.size(), m_pathname, cvt);
+ seq(begin, end);
+ path_traits::convert(seq.c_str(), seq.c_str()+seq.size(), m_pathname, cvt);
return *this;
}
@@ -359,6 +359,7 @@ namespace filesystem
; // change slashes to backslashes
# endif
path& remove_filename();
+ path& remove_trailing_separator();
path& replace_extension(const path& new_extension = path());
void swap(path& rhs) { m_pathname.swap(rhs.m_pathname); }
@@ -739,8 +740,8 @@ namespace filesystem
return *this;
string_type::size_type sep_pos(m_append_separator_if_needed());
std::basic_string<typename std::iterator_traits<InputIterator>::value_type>
- s(begin, end);
- path_traits::convert(s.c_str(), s.c_str()+s.size(), m_pathname);
+ seq(begin, end);
+ path_traits::convert(seq.c_str(), seq.c_str()+seq.size(), m_pathname);
if (sep_pos)
m_erase_redundant_separator(sep_pos);
return *this;
@@ -753,8 +754,8 @@ namespace filesystem
return *this;
string_type::size_type sep_pos(m_append_separator_if_needed());
std::basic_string<typename std::iterator_traits<InputIterator>::value_type>
- s(begin, end);
- path_traits::convert(s.c_str(), s.c_str()+s.size(), m_pathname, cvt);
+ seq(begin, end);
+ path_traits::convert(seq.c_str(), seq.c_str()+seq.size(), m_pathname, cvt);
if (sep_pos)
m_erase_redundant_separator(sep_pos);
return *this;
diff --git a/boost/filesystem/path_traits.hpp b/boost/filesystem/path_traits.hpp
index 5441692..129044a 100644
--- a/boost/filesystem/path_traits.hpp
+++ b/boost/filesystem/path_traits.hpp
@@ -318,8 +318,8 @@ namespace path_traits {
{
if (c.size())
{
- std::basic_string<typename Container::value_type> s(c.begin(), c.end());
- convert(s.c_str(), s.c_str()+s.size(), to);
+ std::basic_string<typename Container::value_type> seq(c.begin(), c.end());
+ convert(seq.c_str(), seq.c_str()+seq.size(), to);
}
}