Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r79409 - in trunk: boost/filesystem libs/filesystem/doc libs/filesystem/doc/src libs/filesystem/test libs/filesystem/test/msvc10
From: bdawes_at_[hidden]
Date: 2012-07-10 17:17:21

Next message: jurko.gospodnetic_at_[hidden]: "[Boost-commit] svn:boost r79410 - trunk/tools/build/v2/engine"
Previous message: vicente.botet_at_[hidden]: "[Boost-commit] svn:boost r79408 - branches/release/libs/thread/doc"

Author: bemandawes
Date: 2012-07-10 17:17:20 EDT (Tue, 10 Jul 2012)
New Revision: 79409
URL: http://svn.boost.org/trac/boost/changeset/79409

Log:
Add directory_iterator and recursive_directory_iterator free functions begin and end so that these iterators can be used with range-based for statements.
Text files modified:
   trunk/boost/filesystem/operations.hpp | 17 ++
   trunk/libs/filesystem/doc/reference.html | 246 ++++++++++++++++++++++-----------------
   trunk/libs/filesystem/doc/release_history.html | 9 +
   trunk/libs/filesystem/doc/src/source.html | 24 +++
   trunk/libs/filesystem/test/msvc10/filesystem-v3.sln | 8 -
   trunk/libs/filesystem/test/operations_unit_test.cpp | 67 ++++++++++
   6 files changed, 255 insertions(+), 116 deletions(-)

Modified: trunk/boost/filesystem/operations.hpp
==============================================================================
--- trunk/boost/filesystem/operations.hpp (original)
+++ trunk/boost/filesystem/operations.hpp 2012-07-10 17:17:20 EDT (Tue, 10 Jul 2012)
@@ -721,6 +721,14 @@
       { return m_imp == rhs.m_imp; }
   };

+ // enable range-base for statement use
+
+ inline
+ directory_iterator& begin(directory_iterator& iter) {return iter;}
+
+ inline
+ directory_iterator end(const directory_iterator&) {return directory_iterator();}
+
//--------------------------------------------------------------------------------------//
// //
// recursive_directory_iterator helpers //
@@ -967,6 +975,15 @@

   };

+ // enable range-base for statement use
+
+ inline
+ recursive_directory_iterator& begin(recursive_directory_iterator& iter) {return iter;}
+
+ inline
+ recursive_directory_iterator end(const recursive_directory_iterator&)
+ {return recursive_directory_iterator();}
+
# if !defined(BOOST_FILESYSTEM_NO_DEPRECATED)
   typedef recursive_directory_iterator wrecursive_directory_iterator;
# endif

Modified: trunk/libs/filesystem/doc/reference.html
==============================================================================
--- trunk/libs/filesystem/doc/reference.html (original)
+++ trunk/libs/filesystem/doc/reference.html 2012-07-10 17:17:20 EDT (Tue, 10 Jul 2012)
@@ -193,31 +193,20 @@

This reference documentation describes components that perform operations on file systems and
their components, such as paths, regular files, and directories.
-Operating systems such as Linux, MAC OS, UNIX, and Windows are
-mentioned in this reference documentation for purposes of illustration or to give guidance to
-implementers. No slight to other operating systems is implied or intended.
-Footnote: Linux® is a
-registered trademark of Linus Torvalds.
-<a name="Footnote-3">Footnote</a>: MAC OS® is a registered trademark
-of Apple Inc.
-Footnote: UNIX® is a
-registered trademark of The Open Group. 
-<a name="Footnote-4">Footnote</a>: Windows® is a registered
-trademark of Microsoft Corporation.

<h2><a name="Conformance">Conformance</a></h2>
-Behavior is sometimes specified by reference to ISO/IEC 9945:2003, 
-POSIX. How such behavior is actually implemented is unspecified.
+Behavior is sometimes specified by reference to ISO/IEC 9945. How such behavior is actually implemented is unspecified.
<blockquote>
[Note: This constitutes an "as if" rule for implementation of
-operating system dependent behavior. Presumably implementations will usually call native
+operating system dependent behavior. In practice implementations will usually call native
operating system API's. --end note]
</blockquote>
-Implementations are encouraged, but not required, to support such behavior
+Implementations are encouraged, but not required, to prove such behavior

-as it is defined by POSIX. Implementations shall document any
-behavior that differs from the POSIX defined behavior. Implementations that do not support exact POSIX behavior are
-encouraged to provide behavior as close to POSIX behavior as is reasonable given the
+as it is defined by ISO/IEC 9945. Implementations shall document any
+behavior that differs from the ISO/IEC 9945 defined behavior. Implementations that do not support exact
+ISO/IEC 9945 behavior are
+encouraged to provide behavior as close to ISO/IEC 9945 behavior as is reasonable given the
limitations of actual operating systems and file systems. If an implementation cannot provide any
reasonable behavior, the implementation shall report an error in an
implementation-defined manner.
@@ -235,11 +224,6 @@
file systems. Implementations are only required to support the FAT features
supported by the host operating system. -- end example]
</blockquote>
-Specific operating systems such as OpenVMS,
-UNIX, and Windows are mentioned only for purposes of illustration or to
-give guidance to users and implementers. No slight to other operating systems is implied
-or intended. When unlikely to cause confusion, the term POSIX is
-sometimes used to refer to "POSIX-compliant operating systems".
The behavior of functions described in this
reference
may differ from their specification in
@@ -267,9 +251,9 @@
and <code>..</code>  have special meaning. Implementations may define
additional filenames that have special meaning.
<blockquote>
- [Note: Most operating systems prohibit the ASCII control characters
+ [Note: Many operating systems prohibit the ASCII control characters
 (0x00-0x1F) in filenames.
- Windows prohibits the characters 0x00-0x1F, <code>"</code>,<code>
+ One widely used operating system prohibits the characters 0x00-0x1F, <code>"</code>,<code>
 *</code>,<code> :</code>,<code> <</code>,<code> ></code>,<code> ?</code>,<code>
 \</code>,<code> /</code>, and<code> |</code> --end note]
</blockquote>
@@ -277,23 +261,26 @@
the location of a file within a filesystem. The elements are the root-nameopt, 
root-directoryopt, and an optional sequence of filenames. [Note:
A pathname is the concrete representation of a path. --end note]
+POSIX API systems: Operating systems that use the ISO/IEC 9945
+API as their native application program interface.
+Windows API systems: Operating systems that use the Windows API
+as their native application program interface.
<a name="Absolute-path">Absolute path</a>: A path that
unambiguously
-identifies the location of a file within a file system without reference to an
-additional starting location. The format is implementation defined. 
-<blockquote>
- [Note: For POSIX-like implementations, including Unix
- variants, Linux, and Mac OS X, only paths
- that begin with a slash are absolute paths.
- For Windows-like implementations, including <a href="http://www.cygwin.com/">
- Cygwin</a> and
- MinGW, only paths that begin with a drive
- specifier followed by a slash, or begin with two slashes, are absolute paths. --end
+identifies the location of a file without reference to an additional starting
+location. The elements of a path that determine if it is absolute are
+implementation defined.
+<blockquote>
+ [Note: For POSIX API systems, paths that begin with one or
+ more directory-specifier characters are absolute paths.
+ For Windows API systems, paths that begin with a drive specifier (i.e. a
+ single letter followed by a colon) followed by one or more directory-specifier
+ characters, or begin with two directory-specifier characters, are absolute paths. --end
 note]
</blockquote>
<a name="Relative-path">Relative path</a>: A path that only
unambiguously
-identifies the location of a file within a filesystem when resolved relative to
+identifies the location of a file when resolved relative to
a starting location. The format is implementation defined. [Note:
Paths "." and ".." are considered to be relative paths. --end note]
<a name="Canonical-path">Canonical path</a>: An absolute path that has
@@ -311,10 +298,11 @@
implementation-defined
<blockquote>
 <blockquote>
-[Note: Most POSIX and Windows based operating systems define a name
-beginning with two slashes (or backslashes, for Windows) as a root-name
-identifying network locations. Windows defines a single letter followed by a
-<code>":"</code> as a root-name identifying a disc drive. --end note]
+[Note: Many operating systems define a name
+beginning with two directory-separator characters as a root-name
+that identifies network locations. Some
+operating systems defines a single letter followed by a colon as a drive
+specifier; a root-name identifying a specific device such as a disc drive. --end note]
 </blockquote>
</blockquote>
root-directory: 
@@ -332,20 +320,29 @@
            <code>"."</code> 
            <code>
".."</code>
+preferred-separator:opt 
+           
+implementation-defined
directory-separator: 
            <code>"/" 
-      "/"</code> directory-separator
+      "/"</code> directory-separator 
+           
+preferred-separator 
+           
+preferred-separator directory-separator
Multiple successive directory-separator characters are considered to
-be the same as one directory-separator character. The filename
+be the same as one directory-separator character.
+The filename
<code>"."</code> is considered to be a reference to the current directory. The
filename <code>".."</code> is considered to be a reference to the
parent
directory. Specific filenames may have special meanings for a particular
-operating system.
+operating system. 
</blockquote>
<a name="native-pathname-format">Native pathname format:</a> 
-An implementation defined format. [Note: For POSIX-like operating
-systems, the native format is the same as the generic format. For Windows, the
+An implementation defined format. [Note: For ISO/IEC 9945 compliant operating
+systems, the native format is the same as the generic format. For one widely
+used non-ISO/IEC 9945 compliant operating system, the
native format is similar to the generic format, but the directory-separator
characters can be either slashes or backslashes. --end note]
<a name="Link">Link</a>: A directory entry object that associates a
@@ -405,8 +402,14 @@

 class directory_iterator;

+ inline directory_iterator& begin(directory_iterator& iter);
+ inline directory_iterator end(const directory_iterator&);
+
 class recursive_directory_iterator;

+ inline recursive_directory_iterator& begin(recursive_directory_iterator& iter);
+ inline recursive_directory_iterator end(const recursive_directory_iterator&);
+
 enum <a name="file_type" href="#Enum-file_type">file_type</a>
 {
 status_error, file_not_found, regular_file, directory_file,
@@ -619,10 +622,6 @@
of a path. The path does not necessarily exist in external storage, and the
pathname is not necessarily valid for the current operating
system or for a particular file system.
-<blockquote>
-[Example: A long path name on Windows is an example of an innocuous appearing path that is not actually valid. --
-end example]
-</blockquote>
<pre>namespace boost
{
 namespace filesystem
@@ -630,7 +629,7 @@
 class path
 {
 public:
- typedef see below value_type; // char for POSIX, wchar_t for Windows
+ typedef see below value_type; // char for ISO/IEC 9945, wchar_t for Windows
 typedef std::basic_string<value_type> string_type;
 typedef std::codecvt<wchar_t, char, std::mbstate_t> codecvt_type;
 constexpr value_type preferred_separator;
@@ -692,7 +691,7 @@
 // modifiers
 void clear();
 path& make_absolute(const path& base);
- path& make_preferred(); // POSIX: no effect. Windows: convert slashes to backslashes
+ path& make_preferred(); // ISO/IEC 9945: no effect. Windows: convert slashes to backslashes
 path& remove_filename();
 path& replace_extension(const path& new_extension = path());
 void swap(path& rhs);
@@ -784,7 +783,7 @@
argument uses the generic format, an implementation defined conversion to native format is performed
during the processing of the argument. 
<blockquote>
-[Note: No conversion occurs on POSIX and Windows since they have
+[Note: No conversion occurs on ISO/IEC 9945 and Windows since they have
native formats that conform to the generic format. --end note]
[Rationale: There is no unambiguous way for an implementation to
always be able distinguish between native format and generic format arguments.
@@ -831,7 +830,7 @@

<blockquote>

-[Note: The above paragraph does not apply to POSIX and Windows since
+[Note: The above paragraph does not apply to ISO/IEC 9945 and Windows since
they use the same format
for both regular file and directory pathnames. --end note]

@@ -847,7 +846,7 @@
Generic format observer functions return strings formatted according to the generic pathname format. The conversion
from generic to native formats is implementation defined.
<blockquote>
-[Note: For POSIX, no conversion is performed. For Windows, backslashes are converted to
+[Note: For ISO/IEC 9945, no conversion is performed. For Windows, backslashes are converted to
forward slashes. -- end note]
</blockquote>
<h4><a name="path-Encoding-conversions"><code>path</code> Encoding conversions</a></h4>
@@ -864,7 +863,7 @@
particularly where user input is involved. -- end rationale]
For all other implementations, including Linux, <code>path::value_type</code> is <code>char</code>. The default imbued locale is <code>std::locale("")</code>.
[Rationale: ISO C specifies this as "the locale-specific native
-environment", while POSIX says it "Specifies an implementation-defined native
+environment", while ISO/IEC 9945 says it "Specifies an implementation-defined native
environment." -- end rationale]
</blockquote>
<h3><a name="path-Requirements"><code>path</code> Requirements</a></h3>
@@ -897,7 +896,7 @@
 or <code>source</code> in <code>pathname</code>. If the contents are in the
 generic format and the generic format is unacceptable to the operating
 system's API, they are converted to the native format. [Note: For
- POSIX and Windows implementations, the generic format is already
+ ISO/IEC 9945 and Windows implementations, the generic format is already
 acceptable as a native format, so no generic to native conversion is
 performed. --end note]
 
@@ -917,7 +916,7 @@
 Effects: Stores the contents [<code>begin</code>,<code>end</code>)
 or <code>source</code> in <code>pathname</code>. If the contents are in the
 generic format, they are converted to the native format. [Note: For
- POSIX and Windows based implementations, the generic format is already
+ ISO/IEC 9945 and Windows based implementations, the generic format is already
 acceptable as a native format, so no generic to native conversion is
 performed. --end note]
 
@@ -933,7 +932,7 @@
 preferred
 directory separator is implementation-defined.
<blockquote>
- [Note: For POSIX-like implementations, including Unix variants, Linux, and Mac OS X, the preferred directory separator is a
+ [Note: For ISO/IEC 9945-like implementations, including Unix variants, Linux, and Mac OS X, the preferred directory separator is a
 single forward slash.
 For Windows-like implementations, including Cygwin and MinGW, the preferred directory
 separator is a single backslash.--end note]
@@ -973,7 +972,7 @@
 Appends the contents [<code>begin</code>,<code>end</code>)
 or <code>source</code> to <code>pathname</code>. If the contents are in the
 generic format, they are converted to the native format. [Note: For
- POSIX and Windows based implementations, the generic format is already
+ ISO/IEC 9945 and Windows based implementations, the generic format is already
 acceptable as a native format, so no generic to native conversion is
 performed. --end note]
 </blockquote>
@@ -1018,7 +1017,7 @@
<blockquote>
 Effects: The contained pathname is converted to the preferred native
 format. [Note: On Windows, the effect is to replace slashes with
- backslashes. On POSIX, there is no effect. -- end note]
+ backslashes. On ISO/IEC 9945, there is no effect. -- end note]
 Returns: <code>*this</code>
</blockquote>

@@ -1074,12 +1073,13 @@
Remarks: If <code>string_type</code> is a different type than
function's return type, conversion is performed by <code>cvt</code>.
If <code>string_type</code> is the same type as the
-function's return type, the function is permitted to return by <code>const&</code> rather than <code>const</code> value. [Note: For POSIX, this occurs for <code>string()</code>, for Windows, <code>wstring()</code>. --end note]
+function's return type, the function is permitted to return by <code>const&</code> rather than <code>const</code> value. [Note: For
+ISO/IEC 9945, this occurs for <code>string()</code>, for Windows, <code>wstring()</code>. --end note]
</blockquote>

<h3> <a name="path-generic-format-observers"><code>path</code> generic format observers</a></h3>
The string returned by all generic format observers is in the generic pathname format.
-[Note: For POSIX, no conversion occurs, since the native format and
+[Note: For ISO/IEC 9945, no conversion occurs, since the native format and
generic format are the same. For Windows, backslashes are converted to slashes --end note]
<pre>template <class String>
String <a name="generic_string-template">generic_string</a>(const codecvt_type& cvt=codecvt()) const;</pre>
@@ -1097,7 +1097,8 @@
function's return type, conversion is performed by <code>cvt</code>.
If <code>string_type</code> is of the same type as the
function's return type, and the generic format is the same as the native format,
-the function is permitted to return by <code>const&</code> rather than <code>const</code> value. [Note: For POSIX, this occurs for <code>string()</code>.
+the function is permitted to return by <code>const&</code> rather than <code>const</code> value. [Note: For
+ISO/IEC 9945, this occurs for <code>string()</code>.
It never occurs for Windows, because backslashes must be converted to slashes. --end note]
</blockquote>

@@ -1232,7 +1233,7 @@
<pre>bool <a name="path-is_absolute">is_absolute</a>() const;</pre>
<blockquote>
 Returns: <code>true</code> if the elements of <code>root_path()</code> uniquely identify a directory, else <code>false</code>.
- [Note: On POSIX,<code> path("/foo").is_absolute()</code> returns <code>true</code>. On Windows, <code>path("/foo").is_absolute()</code> returns <code>false</code>. --end note]
+ [Note: On ISO/IEC 9945,<code> path("/foo").is_absolute()</code> returns <code>true</code>. On Windows, <code>path("/foo").is_absolute()</code> returns <code>false</code>. --end note]
</blockquote>
<pre>bool <a name="path-is_relative">is_relative</a>() const;</pre>
<blockquote>
@@ -1575,8 +1576,9 @@
</table>
<h3><a name="Enum-perms">Enum perms</a></h3>
This enum specifies bitmask constants uses to identify file
-permissions. The POSIX standard specifies actual values, and those values have
-been adopted here because they are very familiar and ingrained for many POSIX
+permissions. The ISO/IEC 9945 standard specifies actual values, and those values have
+been adopted here because they are very familiar and ingrained for many ISO/IEC
+9945
users.
<blockquote>
Caution: Operating systems do not always support permissions as described in
@@ -1594,7 +1596,7 @@
 <td>Name</td>
 <td align="center">Value 
 (octal)</td>
- <td align="center">POSIX 
+ <td align="center">ISO/IEC 9945 
 macro</td>
 <td>Definition or notes</td>
 </tr>
@@ -1667,7 +1669,7 @@
 file's current bits</td>
</tr>
<tr><td><code><a name="symlink_perms">symlink_perms</a></code></td><td><code>0x4000</code></td><td></td><td>
- On POSIX <code>permissions()</code> resolves symlinks unless <code>symlink_perms</code> is specified.
+ On ISO/IEC 9945 <code>permissions()</code> resolves symlinks unless <code>symlink_perms</code> is specified.
 Meaningless on Windows as <code>permissions()</code> never resolves symlinks.
 Meaningless on Mac OS X and some other BSD systems as <code>permissions()</code> always resolves symlinks. Get over it.</td>
</tr>
@@ -1974,7 +1976,7 @@
 <code>directory_iterator</code> satisfies the requirements of an
input iterator (C++ Std, 24.2.1, Input iterators [input.iterators]).
A <code>directory_iterator</code> reads successive elements from the directory for
-which it was constructed, as if by calling POSIX <code>readdir_r()</code>. After a <code>directory_iterator</code> is constructed, and every time <code>operator++</code> is called,
+which it was constructed, as if by calling ISO/IEC 9945 <code>readdir_r()</code>. After a <code>directory_iterator</code> is constructed, and every time <code>operator++</code> is called,
it reads a directory element and stores information about it in a object of type <code>directory_entry</code>. <code>operator++</code> is not equality preserving; that is, <code>i == j</code> does not imply that <code>++i == ++j</code>. 
<blockquote>
[Note: The practical consequence of not preserving equality is that directory iterators
@@ -2007,7 +2009,8 @@
If a file is removed from or added to a directory after the
construction of a <code>directory_iterator</code> for the directory, it is
unspecified whether or not subsequent incrementing of the iterator will ever
-result in an iterator whose value is the removed or added directory entry. See POSIX <code>readdir_r()</code>. --end note]
+result in an iterator whose value is the removed or added directory entry. See 
+ISO/IEC 9945 <code>readdir_r()</code>. --end note]
</blockquote>
<h4><a name="directory_iterator-members"><code>directory_iterator</code> members</a></h4>

@@ -2042,6 +2045,15 @@
Throws: As specified in Error reporting.

</blockquote>
+<h3><code>directory_iterator</code> non-member functions</h3>
+<pre>inline directory_iterator& begin(directory_iterator& iter);</pre>
+<blockquote>
+ Returns: <code>iter</code>.
+</blockquote>
+<pre>inline directory_iterator end(const directory_iterator&);</pre>
+<blockquote>
+ Returns: <code>directory_iterator()</code>.
+</blockquote>
<h3><a name="Class-recursive_directory_iterator">Class <code>recursive_directory_iterator</code></a></h3>
Objects of type <code>recursive_directory_iterator</code> provide standard library
compliant iteration over the contents of a directory, including recursion into
@@ -2179,12 +2191,21 @@
 [Note: <code>no_push()</code> is used to prevent
 unwanted recursion into a directory. --end note]
</blockquote>
+<h3><code>recursive_directory_iterator</code> non-member functions</h3>
+<pre>inline recursive_directory_iterator& begin(recursive_directory_iterator& iter);</pre>
+<blockquote>
+ Returns: <code>iter</code>.
+</blockquote>
+<pre>inline recursive_directory_iterator end(const recursive_directory_iterator&);</pre>
+<blockquote>
+ Returns: recursive_<code>directory_iterator()</code>.
+</blockquote>
<h3><a name="Operational-functions">Operational functions</a></h3>
Operational functions query or modify files, including directories, in external
storage.
Operational functions access a file by resolving an
object of class <code>path</code> to a particular file in a file hierarchy. The
-path is resolved as if by the POSIX Pathname Resolution mechanism.
+path is resolved as if by the ISO/IEC 9945 Pathname Resolution mechanism.
[Note: Because hardware failures, network failures, file system races, and many
other kinds of errors occur frequently in file system operations, users should be aware
that any filesystem operational function, no matter how apparently innocuous, may encounter
@@ -2301,7 +2322,7 @@
bool <a name="create_directory2">create_directory</a>(const path& p, system::error_code& ec);</pre>
<blockquote>
 Effects: Establishes the postcondition by attempting to create the
- directory <code>p</code> resolves to, as if by POSIX <code><a href="http://www.opengroup.org/onlinepubs/000095399/functions/mkdir.html">
+ directory <code>p</code> resolves to, as if by ISO/IEC 9945 <code><a href="http://www.opengroup.org/onlinepubs/000095399/functions/mkdir.html">
 mkdir()</a></code> with a second argument of S_IRWXU|S_IRWXG|S_IRWXO. Creation
 failure because <code>p</code> resolves to an existing directory shall not be
 treated as an error. 
@@ -2312,7 +2333,7 @@
<pre>void <a name="create_directory_symlink">create_directory_symlink</a>(const path& to, const path& new_symlink);
void create_directory_symlink(const path& to, const path& new_symlink, system::error_code& ec);</pre>
<blockquote>
- Effects: Establishes the postcondition, as if by POSIX <code>symlink()</code>.
+ Effects: Establishes the postcondition, as if by ISO/IEC 9945 <code>symlink()</code>.
 
 Postcondition: <code>new_symlink</code> resolves to a symbolic link file that
 contains an unspecified representation of <code>to</code>.
@@ -2329,7 +2350,7 @@
<pre>void <a name="create_hard_link">create_hard_link</a>(const path& to, const path& new_hard_link);
void <a name="create_hard_link2">create_hard_link</a>(const path& to, const path& new_hard_link, system::error_code& ec);</pre>
<blockquote>
- Effects: Establishes the postcondition, as if by POSIX <code>link()</code>.
+ Effects: Establishes the postcondition, as if by ISO/IEC 9945 <code>link()</code>.
 Postcondition:
 <ul>
 <li> <code>exists(to) &&
@@ -2349,7 +2370,7 @@
<pre>void <a name="create_symlink">create_symlink</a>(const path& to, const path& new_symlink);
void <a name="create_symlink2">create_symlink</a>(const path& to, const path& new_symlink, system::error_code& ec);</pre>
<blockquote>
- Effects: Establishes the postcondition, as if by POSIX <code>symlink()</code>.
+ Effects: Establishes the postcondition, as if by ISO/IEC 9945 <code>symlink()</code>.
 
 Postcondition: <code>new_symlink</code> resolves to a symbolic link file that
 contains an unspecified representation of <code>to</code>.
@@ -2364,7 +2385,8 @@
<pre>path <a name="current_path">current_path</a>();
path <a name="current_path2">current_path</a>(system::error_code& ec);</pre>
<blockquote>
- Returns: The current working directory path, as if by POSIX <code>getcwd()</code>. <code>is_absolute()</code> is true for the returned path.
+ Returns: The current working directory path, as if by ISO/IEC
+ 9945 <code>getcwd()</code>. <code>is_absolute()</code> is true for the returned path.
 Throws: As specified in Error reporting.
 [Note: The <code>current_path()</code> name was chosen to emphasize that the return is a
 path, not just a single directory name.
@@ -2375,7 +2397,7 @@
<pre>void current_path(const path& p);
void current_path(const path& p, system::error_code& ec);</pre>
<blockquote>
- Effects: Establishes the postcondition, as if by POSIX <code>chdir()</code>.
+ Effects: Establishes the postcondition, as if by ISO/IEC 9945 <code>chdir()</code>.
Postcondition: <code>equivalent(p, current_path())</code>.
Throws: As specified in Error reporting.
 [Note: The current path for many operating systems is a dangerous
@@ -2404,9 +2426,10 @@
 <blockquote>
 Two paths are considered to resolve to the same
 file system entity if two candidate entities reside on the same device at the
- same location. This is determined as if by the values of the POSIX <code>stat</code> structure<code>,</code> obtained as if by <code>stat()</code> for the two paths, having equal <code>st_dev</code> values
+ same location. This is determined as if by the values of the ISO/IEC 9945 <code>stat</code> structure<code>,</code> obtained as if by <code>stat()</code> for the two paths, having equal <code>st_dev</code> values
 and equal <code>st_ino</code> values.
- [Note: POSIX requires that "st_dev must be unique within a Local Area Network". Conservative POSIX implementations may also wish to check for equal <code>st_size</code> and <code>st_mtime</code> values. Windows implementations may use <code>GetFileInformationByHandle()</code> as a surrogate for <code>stat()</code>,
+ [Note: ISO/IEC 9945 requires that "st_dev must be unique within a Local Area Network". Conservative 
+ ISO/IEC 9945 implementations may also wish to check for equal <code>st_size</code> and <code>st_mtime</code> values. Windows implementations may use <code>GetFileInformationByHandle()</code> as a surrogate for <code>stat()</code>,
 and consider "same" to be equal values for <code>dwVolumeSerialNumber</code>, <code>nFileIndexHigh</code>, <code>nFileIndexLow</code>, <code>nFileSizeHigh</code>, <code>nFileSizeLow</code>, <code>ftLastWriteTime.dwLowDateTime</code>, and <code>ftLastWriteTime.dwHighDateTime</code>. -- end note]
 </blockquote>
 Throws: <code>filesystem_error</code> if <code>(!exists(s1) && !exists(s2)) || (is_other(s1) && is_other(s2))</code>,
@@ -2420,7 +2443,8 @@
 Returns: If <code>exists(p) && is_regular_file(p)</code>, the size
 in bytes
 of the file <code>p</code> resolves to, determined as if by the value of
- the POSIX <code>stat</code> structure member <code>st_size</code> obtained as if by POSIX <code>stat()</code>.
+ the ISO/IEC 9945 <code>stat</code> structure member <code>st_size</code> obtained as if by 
+ ISO/IEC 9945 <code>stat()</code>.
 Otherwise, <code>static_cast<uintmax_t>(-1)</code>.
 Throws: As specified in Error reporting.
</blockquote>
@@ -2506,15 +2530,17 @@
std::time_t <a name="last_write_time2">last_write_time</a>(const path& p<code>, system::error_code& ec</code>);</pre>
<blockquote>
 Returns: The time of last data modification of <code>p</code>, determined as if by the
- value of the POSIX <code>stat</code> structure member <code>st_mtime</code>  obtained
- as if by POSIX <code>stat()</code>.
+ value of the ISO/IEC 9945 <code>stat</code> structure member <code>st_mtime</code>  obtained
+ as if by ISO/IEC 9945 <code>stat()</code>.
 Throws: As specified in Error reporting.
</blockquote>
<pre>void <a name="last_write_time3">last_write_time</a>(const path& p, const std::time_t new_time);
void <a name="last_write_time4">last_write_time</a>(const path& p, const std::time_t new_time<code>, system::error_code& ec</code>);</pre>
<blockquote>
 Effects: Sets the time of last data modification of the file
- resolved to by <code>p</code> to <code>new_time</code>, as if by POSIX <code>stat()</code> followed by POSIX utime().
+ resolved to by <code>p</code> to <code>new_time</code>, as if by ISO/IEC
+ 9945 <code>stat()</code> followed by 
+ ISO/IEC 9945 utime().
 Throws: As specified in Error reporting.
 [Note: A postcondition of <code>last_write_time(p) == new_time</code> is not specified since it might not hold for file systems
 with coarse time granularity. -- end note]
@@ -2524,7 +2550,8 @@
<blockquote>
 
 Requires: <code>!((prms & add_perms) && (prms & remove_perms))</code>.
- Effects: Applies the effective permissions bits from <code>prms</code> to the file <code>p</code> resolves to, as if by POSIX <code>fchmodat()</code>. The effective permission bits are determined as
+ Effects: Applies the effective permissions bits from <code>prms</code> to the file <code>p</code> resolves to, as if by 
+ ISO/IEC 9945 <code>fchmodat()</code>. The effective permission bits are determined as
 specified by the following table. 
 <table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
 <tr>
@@ -2563,7 +2590,7 @@
<blockquote>
 Effects:  If <code>exists(symlink_status(p,ec))</code>, it is
 removed
- as if by POSIX <code>remove()</code>.
+ as if by ISO/IEC 9945 <code>remove()</code>.
 <blockquote>
 [Note: A symbolic link is itself removed, rather than the file it
 resolves to being removed. -- end note]
@@ -2578,7 +2605,7 @@
<blockquote>
 Effects:  Recursively deletes the contents of p if it exists,
 then deletes file <code>p</code> itself,
- as if by POSIX <code>remove()</code>.
+ as if by ISO/IEC 9945 <code>remove()</code>.
 <blockquote>
 [Note: A symbolic link is itself removed, rather than the file it
 resolves to being removed. -- end note]
@@ -2590,12 +2617,13 @@
<pre>void <a name="rename">rename</a>(const path& old_p, const path& new_p);
void <a name="rename2">rename</a>(const path& old_p, const path& new_p, system::error_code& ec);</pre>
<blockquote>
- Effects: Renames <code>old_p</code> to <code>new_p</code>, as if by POSIX <code>rename()</code>.
+ Effects: Renames <code>old_p</code> to <code>new_p</code>, as if by 
+ ISO/IEC 9945 <code>rename()</code>.
 <blockquote>
 [Note: If <code>old_p</code> and <code>new_p</code> resolve to the
 same existing file, no action is taken. Otherwise, if <code>new_p</code> resolves to an
 existing non-directory file, it is removed, while if <code>new_p</code> resolves to an
- existing directory, it is removed if empty on POSIX but is an error on Windows. A symbolic link is itself renamed, rather than
+ existing directory, it is removed if empty on ISO/IEC 9945 but is an error on Windows. A symbolic link is itself renamed, rather than
 the file it resolves to being renamed. -- end note]
 </blockquote>
 Throws: As specified in Error reporting.
@@ -2605,14 +2633,14 @@
<blockquote>
Postcondition: <code>file_size() == new_size</code>.
Throws: As specified in Error reporting.
- Remarks: Achieves its postconditions as if by
- POSIX <code>truncate()</code>.
+ Remarks: Achieves its postconditions as if by ISO/IEC 9945 <code>truncate()</code>.
</blockquote>
<pre>space_info <a name="space">space</a>(const path& p);
space_info <a name="space2">space</a>(const path& p, system::error_code& ec);</pre>
<blockquote>
 Returns: An object of type <code>space_info</code>. The value of the <code>space_info</code> object is determined as if by
- using POSIX <code>statvfs()</code> to obtain a POSIX struct <code>statvfs</code>, and then multiplying its <code>f_blocks</code>, <code>f_bfree</code>, and <code>f_bavail</code> members by its <code>f_frsize</code> member, and assigning the results to the <code>capacity</code>, <code>free</code>,
+ using ISO/IEC 9945 <code>statvfs()</code> to obtain a 
+ ISO/IEC 9945 struct <code>statvfs</code>, and then multiplying its <code>f_blocks</code>, <code>f_bfree</code>, and <code>f_bavail</code> members by its <code>f_frsize</code> member, and assigning the results to the <code>capacity</code>, <code>free</code>,
 and <code>available</code> members respectively. Any members for which the
 value cannot be determined shall be set to -1.
 Throws: As specified in Error reporting.
@@ -2638,7 +2666,7 @@
 Effects: 
 <blockquote>
 If possible, determines the attributes
- of the file <code>p</code> resolves to, as if by POSIX <code>stat()</code>.
+ of the file <code>p</code> resolves to, as if by ISO/IEC 9945 <code>stat()</code>.
 If, during attribute determination, the underlying file system API reports
 an error, sets <code>ec</code> to indicate the specific error reported.
 Otherwise, <code>ec.clear()</code>.<blockquote>
@@ -2652,7 +2680,7 @@
 <ul>
 <li>If the specific error indicates that <code>p</code> cannot be resolved
 because some element of the path does not exist, return <code>
- file_status(file_not_found)</code>. [Note: POSIX errors that
+ file_status(file_not_found)</code>. [Note: ISO/IEC 9945 errors that
 indicate this are ENOENT or ENOTDIR. Windows equivalents
 include ERROR_FILE_NOT_FOUND, ERROR_PATH_NOT_FOUND, ERROR_INVALID_NAME,
 ERROR_INVALID_PARAMETER, ERROR_BAD_PATHNAME, and ERROR_BAD_NETPATH. --
@@ -2661,7 +2689,7 @@
 <li>Otherwise, if the specific error indicates that <code>p</code> can be resolved
 but the attributes cannot be determined, return <code>
 file_status(type_unknown)</code>. [Note: For example, Windows
- ERROR_SHARING_VIOLATION errors. For POSIX, the case never arises. -- end
+ ERROR_SHARING_VIOLATION errors. For ISO/IEC 9945, the case never arises. -- end
 note] 
 </li>
 <li>Otherwise, return <code>
@@ -2674,7 +2702,7 @@
 </blockquote>
 Otherwise,
 <ul>
- <li>If the attributes indicate a regular file, as if by POSIX S_ISREG(),
+ <li>If the attributes indicate a regular file, as if by ISO/IEC 9945 S_ISREG(),
 return <code>
 file_status(regular_file)</code>. [Note: <code>
regular_file</code> implies appropriate <code><fstream></code> operations
@@ -2685,29 +2713,34 @@
fail on a directory.
-- end note] 
 </li>
- <li>Otherwise, if the attributes indicate a directory, as if by POSIX
+ <li>Otherwise, if the attributes indicate a directory, as if by ISO/IEC
+ 9945
 <a href="http://www.opengroup.org/onlinepubs/000095399/basedefs/sys/stat.h.html">S_ISDIR()</a>,
 return <code>
 file_status(directory_file)</code>. [Note: <code>directory_file</code> implies <code>
directory_iterator(p)</code>would succeed.
-- end note] 
 </li>
- <li>Otherwise, if the attributes indicate a block special file, as if by POSIX
+ <li>Otherwise, if the attributes indicate a block special file, as if by 
+ ISO/IEC 9945
 <a href="http://www.opengroup.org/onlinepubs/000095399/basedefs/sys/stat.h.html">S_ISBLK()</a>,
 return <code>
 file_status(block_file)</code>. 
 </li>
- <li>Otherwise, if the attributes indicate a character special file, as if by POSIX
+ <li>Otherwise, if the attributes indicate a character special file, as if by 
+ ISO/IEC 9945
 <a href="http://www.opengroup.org/onlinepubs/000095399/basedefs/sys/stat.h.html">S_ISCHR()</a>,
 return <code>
 file_status(character_file)</code>. 
 </li>
- <li>Otherwise, if the attributes indicate a fifo or pipe file, as if by POSIX
+ <li>Otherwise, if the attributes indicate a fifo or pipe file, as if by 
+ ISO/IEC 9945
 <a href="http://www.opengroup.org/onlinepubs/000095399/basedefs/sys/stat.h.html">S_ISFIFO()</a>,
 return <code>
 file_status(fifo_file)</code>. 
 </li>
- <li>Otherwise, if the attributes indicate a socket, as if by POSIX
+ <li>Otherwise, if the attributes indicate a socket, as if by ISO/IEC
+ 9945
 <a href="http://www.opengroup.org/onlinepubs/000095399/basedefs/sys/stat.h.html">S_ISSOCK()</a>,
 return <code>
 file_status(socket_file)</code>. 
@@ -2729,11 +2762,11 @@
<blockquote>
 Effects:  Same as status(), above,
 except that the attributes
- of <code>p</code> are determined as if by POSIX <code>lstat()</code>.
+ of <code>p</code> are determined as if by ISO/IEC 9945 <code>lstat()</code>.
</blockquote>
<blockquote>
 Returns: Same as status(), above, except
- that if the attributes indicate a symbolic link, as if by POSIX <a class="external" href="http://www.opengroup.org/onlinepubs/000095399/basedefs/sys/stat.h.html">S_ISLNK()</a>, return <code>file_status(symlink_file)</code>.
+ that if the attributes indicate a symbolic link, as if by ISO/IEC 9945 <a class="external" href="http://www.opengroup.org/onlinepubs/000095399/basedefs/sys/stat.h.html">S_ISLNK()</a>, return <code>file_status(symlink_file)</code>.
 Remarks: Pathname resolution terminates if <code>p</code> names a symbolic link.
 Throws: <code>filesystem_error</code>; overload with <code>error_code&</code> throws
 nothing.
@@ -2747,7 +2780,7 @@
 Returns: The composed path.
 Postcondition: For the returned path, <code>rp,</code> <code>rp.is_absolute()</code> is true.
 Throws: As specified in Error reporting.
- [Note: For POSIX, <code>system_complete(p)</code> has the same semantics as <code>complete(p, current_path())</code>.
+ [Note: For ISO/IEC 9945, <code>system_complete(p)</code> has the same semantics as <code>complete(p, current_path())</code>.
 <a name="windows_effects">For Windows</a>, <code>system_complete(p)</code> has the
 same semantics as <code>complete(ph, current_path())</code> if <code>p.is_absolute() || !p.has_root_name()</code> or <code>p</code> and <code>base</code> have the same <code>root_name()</code>.
 Otherwise it acts like <code>complete(p, kinky)</code>, where <code>kinky</code> is the current directory for the <code>p.root_name()</code> drive. This will
@@ -2764,7 +2797,7 @@
 conventions of the operating system. The specifics of how this path is
 determined are implementation defined. An error shall be reported if<code> !exists(p)
 || !is_directory(p)</code>, where <code>p</code> is the path to be returned.
- POSIX: The path supplied by the first environment variable found in the
+ ISO/IEC 9945: The path supplied by the first environment variable found in the
 list TMPDIR, TMP, TEMP, TEMPDIR. If none of these are found, <code>"/tmp"</code>.
 Windows: The path reported by the Windows <code>GetTempPath</code> API function.
 Throws: As specified in Error reporting.
@@ -2856,7 +2889,8 @@

<h2><a name="Path-decomposition-table">Path decomposition table</a></h2>
The table is generated by a program compiled with the Boost implementation.
-Shaded entries indicate cases where POSIX and Windows implementations yield different results. The top value is the POSIX result and the bottom value is the Windows result. 
+Shaded entries indicate cases where ISO/IEC 9945 and Windows implementations yield different results. The top value is the 
+ISO/IEC 9945 result and the bottom value is the Windows result. 
<table border="1" cellspacing="0" cellpadding="5">

<tr><td>Constructor argument</td>
@@ -3402,7 +3436,7 @@
<h2><a name="References">References</a></h2>
<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111" width="100%">
 <tr>
- <td width="16%" valign="top">[<a name="ISO_POSIX">ISO-POSIX</a>]</td>
+ <td width="16%" valign="top">[<a name="ISO_POSIX">ISO-ISO/IEC 9945</a>]</td>
 <td width="84%">ISO/IEC 9945:2003, IEEE Std 1003.1-2001, and The Open Group
 Base Specifications, Issue 6. Also known as The Single Unix®
 Specification, Version 3. Available from each of the organizations involved

Modified: trunk/libs/filesystem/doc/release_history.html
==============================================================================
--- trunk/libs/filesystem/doc/release_history.html (original)
+++ trunk/libs/filesystem/doc/release_history.html 2012-07-10 17:17:20 EDT (Tue, 10 Jul 2012)
@@ -36,6 +36,13 @@
</tr>
</table>

+<h2>1.51.0</h2>
+<ul>
+ <li>Add begin() and end() non-member functions for directory_iterator and
+ recursive_directory_iterator so that C++11 range-based for statements now
+ work.</li>
+</ul>
+
<h2>1.50.0</h2>
<ul>
<li>Remove Filesystem Version 2 from the distribution. Version 3 is now the
@@ -163,7 +170,7 @@
</ul>
<hr>
Revised
-18 June, 2012
+10 July, 2012
© Copyright Beman Dawes, 2011
 Use, modification, and distribution are subject to the Boost Software
License, Version 1.0. See <a href="http://www.boost.org/LICENSE_1_0.txt">

Modified: trunk/libs/filesystem/doc/src/source.html
==============================================================================
--- trunk/libs/filesystem/doc/src/source.html (original)
+++ trunk/libs/filesystem/doc/src/source.html 2012-07-10 17:17:20 EDT (Tue, 10 Jul 2012)
@@ -364,8 +364,14 @@

 class directory_iterator;

+ inline directory_iterator& begin(directory_iterator& iter);
+ inline directory_iterator end(const directory_iterator&);
+
 class recursive_directory_iterator;

+ inline recursive_directory_iterator& begin(recursive_directory_iterator& iter);
+ inline recursive_directory_iterator end(const recursive_directory_iterator&);
+
 enum <a name="file_type" href="#Enum-file_type">file_type</a>
 {
 status_error, file_not_found, regular_file, directory_file,
@@ -1983,6 +1989,15 @@
Throws: As specified in Error reporting.

</blockquote>
+<h3><code>directory_iterator</code> non-member functions</h3>
+<pre>inline directory_iterator& begin(directory_iterator& iter);</pre>
+<blockquote>
+ Returns: <code>iter</code>.
+</blockquote>
+<pre>inline directory_iterator end(const directory_iterator&);</pre>
+<blockquote>
+ Returns: <code>directory_iterator()</code>.
+</blockquote>
<h3><a name="Class-recursive_directory_iterator">Class <code>recursive_directory_iterator</code></a></h3>
Objects of type <code>recursive_directory_iterator</code> provide standard library
compliant iteration over the contents of a directory, including recursion into
@@ -2116,6 +2131,15 @@
 [Note: <code>no_push()</code> is used to prevent
 unwanted recursion into a directory. --end note]
</blockquote>
+<h3><code>recursive_directory_iterator</code> non-member functions</h3>
+<pre>inline recursive_directory_iterator& begin(recursive_directory_iterator& iter);</pre>
+<blockquote>
+ Returns: <code>iter</code>.
+</blockquote>
+<pre>inline recursive_directory_iterator end(const recursive_directory_iterator&);</pre>
+<blockquote>
+ Returns: recursive_<code>directory_iterator()</code>.
+</blockquote>
<h3><a name="Operational-functions">Operational functions</a></h3>
Operational functions query or modify files, including directories, in external
storage.

Modified: trunk/libs/filesystem/test/msvc10/filesystem-v3.sln
==============================================================================
--- trunk/libs/filesystem/test/msvc10/filesystem-v3.sln (original)
+++ trunk/libs/filesystem/test/msvc10/filesystem-v3.sln 2012-07-10 17:17:20 EDT (Tue, 10 Jul 2012)
@@ -206,14 +206,6 @@
                 {3667C35E-78D5-43D4-AAC2-349145E4341D}.Debug|Win32.Build.0 = Debug|Win32
                 {3667C35E-78D5-43D4-AAC2-349145E4341D}.Release|Win32.ActiveCfg = Release|Win32
                 {3667C35E-78D5-43D4-AAC2-349145E4341D}.Release|Win32.Build.0 = Release|Win32
- {20E2805D-9634-46CE-B979-21CCBBD16EA3}.Debug|Win32.ActiveCfg = Debug|Win32
- {20E2805D-9634-46CE-B979-21CCBBD16EA3}.Debug|Win32.Build.0 = Debug|Win32
- {20E2805D-9634-46CE-B979-21CCBBD16EA3}.Release|Win32.ActiveCfg = Release|Win32
- {20E2805D-9634-46CE-B979-21CCBBD16EA3}.Release|Win32.Build.0 = Release|Win32
- {E37919AE-1A38-4E61-8E5E-FE4F981C6BFD}.Debug|Win32.ActiveCfg = Debug|Win32
- {E37919AE-1A38-4E61-8E5E-FE4F981C6BFD}.Debug|Win32.Build.0 = Debug|Win32
- {E37919AE-1A38-4E61-8E5E-FE4F981C6BFD}.Release|Win32.ActiveCfg = Release|Win32
- {E37919AE-1A38-4E61-8E5E-FE4F981C6BFD}.Release|Win32.Build.0 = Release|Win32
                 {3640605D-6F82-493D-879F-8F30762DA554}.Debug|Win32.ActiveCfg = Debug|Win32
                 {3640605D-6F82-493D-879F-8F30762DA554}.Debug|Win32.Build.0 = Debug|Win32
                 {3640605D-6F82-493D-879F-8F30762DA554}.Release|Win32.ActiveCfg = Release|Win32

Modified: trunk/libs/filesystem/test/operations_unit_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/operations_unit_test.cpp (original)
+++ trunk/libs/filesystem/test/operations_unit_test.cpp 2012-07-10 17:17:20 EDT (Tue, 10 Jul 2012)
@@ -31,6 +31,7 @@
# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
# endif

+#include <boost/foreach.hpp>
#include <boost/system/error_code.hpp>
#include <boost/detail/lightweight_test.hpp>

@@ -145,12 +146,75 @@

 for (; it != end; ++it)
 {
-// cout << " " << it->path().string() << "\n";
+ //cout << " " << it->path() << "\n";
 }

+ CHECK(directory_iterator(".") != directory_iterator());
+ CHECK(directory_iterator() == end);
+
+#ifndef BOOST_NO_CXX11_RANGE_BASED_FOR
+ for (directory_entry& x : directory_iterator("."))
+ {
+ //cout << " " << x.path() << "\n";
+ }
+#endif
+
+ //BOOST_FOREACH(directory_entry& x, directory_iterator("."))
+ //{
+ // cout << " " << x.path() << "\n";
+ //}
+
 cout << "directory_iterator_test complete" << endl;
 }

+ // recursive_directory_iterator_test -----------------------------------------------//
+
+ void recursive_directory_iterator_test()
+ {
+ cout << "recursive_directory_iterator_test..." << endl;
+
+ recursive_directory_iterator end;
+
+ recursive_directory_iterator it("..");
+
+ CHECK(!it->path().empty());
+
+ if (is_regular_file(it->status()))
+ {
+ CHECK(is_regular_file(it->symlink_status()));
+ CHECK(!is_directory(it->status()));
+ CHECK(!is_symlink(it->status()));
+ CHECK(!is_directory(it->symlink_status()));
+ CHECK(!is_symlink(it->symlink_status()));
+ }
+ else
+ {
+ CHECK(is_directory(it->status()));
+ CHECK(is_directory(it->symlink_status()));
+ CHECK(!is_regular_file(it->status()));
+ CHECK(!is_regular_file(it->symlink_status()));
+ CHECK(!is_symlink(it->status()));
+ CHECK(!is_symlink(it->symlink_status()));
+ }
+
+ for (; it != end; ++it)
+ {
+ //cout << " " << it->path() << "\n";
+ }
+
+ CHECK(recursive_directory_iterator("..") != recursive_directory_iterator());
+ CHECK(recursive_directory_iterator() == end);
+
+#ifndef BOOST_NO_CXX11_RANGE_BASED_FOR
+ for (directory_entry& x : recursive_directory_iterator(".."))
+ {
+ cout << " " << x.path() << "\n";
+ }
+#endif
+
+ cout << "recursive_directory_iterator_test complete" << endl;
+ }
+
 // operations_test -------------------------------------------------------//

 void operations_test()
@@ -258,6 +322,7 @@
 file_status_test();
 query_test();
 directory_iterator_test();
+ recursive_directory_iterator_test();
 operations_test();
 directory_entry_test();
 directory_entry_overload_test();

Next message: jurko.gospodnetic_at_[hidden]: "[Boost-commit] svn:boost r79410 - trunk/tools/build/v2/engine"
Previous message: vicente.botet_at_[hidden]: "[Boost-commit] svn:boost r79408 - branches/release/libs/thread/doc"

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk