|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r60920 - in trunk: boost/property_map libs/property_map/doc libs/property_map/test
From: jewillco_at_[hidden]
Date: 2010-03-29 14:26:23
Author: jewillco
Date: 2010-03-29 14:26:22 EDT (Mon, 29 Mar 2010)
New Revision: 60920
URL: http://svn.boost.org/trac/boost/changeset/60920
Log:
Converted dynamic_properties to use boost::shared_ptr instead of std::auto_ptr
Text files modified:
trunk/boost/property_map/dynamic_property_map.hpp | 31 +++++---------
trunk/libs/property_map/doc/dynamic_property_map.html | 81 ++++++++++++++++++++-------------------
trunk/libs/property_map/doc/dynamic_property_map.rst | 12 ++--
trunk/libs/property_map/test/dynamic_properties_test.cpp | 6 +
4 files changed, 63 insertions(+), 67 deletions(-)
Modified: trunk/boost/property_map/dynamic_property_map.hpp
==============================================================================
--- trunk/boost/property_map/dynamic_property_map.hpp (original)
+++ trunk/boost/property_map/dynamic_property_map.hpp 2010-03-29 14:26:22 EDT (Mon, 29 Mar 2010)
@@ -30,6 +30,7 @@
#include <sstream>
#include <map>
#include <boost/type.hpp>
+#include <boost/smart_ptr.hpp>
namespace boost {
@@ -224,9 +225,9 @@
//
struct dynamic_properties
{
- typedef std::multimap<std::string, dynamic_property_map*>
+ typedef std::multimap<std::string, boost::shared_ptr<dynamic_property_map> >
property_maps_type;
- typedef boost::function3<std::auto_ptr<dynamic_property_map>,
+ typedef boost::function3<boost::shared_ptr<dynamic_property_map>,
const std::string&,
const boost::any&,
const boost::any&> generate_fn_type;
@@ -238,24 +239,16 @@
dynamic_properties() : generate_fn() { }
dynamic_properties(const generate_fn_type& g) : generate_fn(g) {}
- ~dynamic_properties()
- {
- for (property_maps_type::iterator i = property_maps.begin();
- i != property_maps.end(); ++i) {
- delete i->second;
- }
- }
+ ~dynamic_properties() {}
template<typename PropertyMap>
dynamic_properties&
property(const std::string& name, PropertyMap property_map)
{
// Tbd: exception safety
- std::auto_ptr<dynamic_property_map> pm(
+ boost::shared_ptr<dynamic_property_map> pm(
new detail::dynamic_property_map_adaptor<PropertyMap>(property_map));
- property_maps_type::iterator i =
- property_maps.insert(property_maps_type::value_type(name, (dynamic_property_map*)0));
- i->second = pm.release();
+ property_maps.insert(property_maps_type::value_type(name, pm));
return *this;
}
@@ -272,13 +265,13 @@
{ return property_maps.lower_bound(name); }
void
- insert(const std::string& name, std::auto_ptr<dynamic_property_map> pm)
+ insert(const std::string& name, boost::shared_ptr<dynamic_property_map> pm)
{
- property_maps.insert(property_maps_type::value_type(name, pm.release()));
+ property_maps.insert(property_maps_type::value_type(name, pm));
}
template<typename Key, typename Value>
- std::auto_ptr<dynamic_property_map>
+ boost::shared_ptr<dynamic_property_map>
generate(const std::string& name, const Key& key, const Value& value)
{
if(!generate_fn) {
@@ -306,7 +299,7 @@
}
}
- std::auto_ptr<dynamic_property_map> new_map = dp.generate(name, key, value);
+ boost::shared_ptr<dynamic_property_map> new_map = dp.generate(name, key, value);
if (new_map.get()) {
new_map->put(key, value);
dp.insert(name, new_map);
@@ -359,11 +352,11 @@
// The easy way to ignore properties.
inline
-std::auto_ptr<boost::dynamic_property_map>
+boost::shared_ptr<boost::dynamic_property_map>
ignore_other_properties(const std::string&,
const boost::any&,
const boost::any&) {
- return std::auto_ptr<boost::dynamic_property_map>(0);
+ return boost::shared_ptr<boost::dynamic_property_map>();
}
} // namespace boost
Modified: trunk/libs/property_map/doc/dynamic_property_map.html
==============================================================================
--- trunk/libs/property_map/doc/dynamic_property_map.html (original)
+++ trunk/libs/property_map/doc/dynamic_property_map.html 2010-03-29 14:26:22 EDT (Mon, 29 Mar 2010)
@@ -1,22 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright 2004-5 The Trustees of Indiana University.
-
- Use, modification and distribution is subject to the Boost Software
- License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
- http://www.boost.org/LICENSE_1_0.txt)
--->
-
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.3.8: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
<title>Boost Dynamic Property Maps</title>
-<link rel="stylesheet" href="../../../boost.css" type="text/css" />
+<link rel="stylesheet" href="../../parameter/doc/html/rst.css" type="text/css" />
</head>
<body>
<div class="document" id="logo-dynamic-property-maps">
-<h1 class="title"><a class="reference" href="../../../index.htm"><img align="middle" alt="Boost" src="../../../boost.png" /></a> Dynamic Property Maps</h1>
+<h1 class="title"><a class="reference external" href="../../../index.htm"><img align="middle" alt="Boost" class="align-middle" src="../../../boost.png" /></a> Dynamic Property Maps</h1>
+
+<!-- Copyright 2004-5 The Trustees of Indiana University.
+
+Use, modification and distribution is subject to the Boost Software
+License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt) -->
<div class="section" id="summary">
<h1><a class="toc-backref" href="#id2">Summary</a></h1>
<p>The dynamic property map interfaces provides access to a collection of
@@ -26,17 +25,17 @@
maps to interface more easily and completely with scripting languages
and other text-based representations of key-value data.</p>
<div class="contents topic" id="contents">
-<p class="topic-title first">Contents</a></p>
+<p class="topic-title first">Contents</p>
<ul class="simple">
-<li><a class="reference" href="#summary" id="id2" name="id2">Summary</a></li>
-<li><a class="reference" href="#introduction" id="id3" name="id3">Introduction</a><ul>
-<li><a class="reference" href="#fred-s-info-revisited" id="id4" name="id4">"Fred's Info" Revisited</a></li>
+<li><a class="reference internal" href="#summary" id="id2">Summary</a></li>
+<li><a class="reference internal" href="#introduction" id="id3">Introduction</a><ul>
+<li><a class="reference internal" href="#fred-s-info-revisited" id="id4">"Fred's Info" Revisited</a></li>
</ul>
</li>
-<li><a class="reference" href="#reference" id="id5" name="id5">Reference</a><ul>
-<li><a class="reference" href="#member-functions" id="id6" name="id6">Member Functions</a></li>
-<li><a class="reference" href="#free-functions" id="id7" name="id7">Free functions</a></li>
-<li><a class="reference" href="#exceptions" id="id8" name="id8">Exceptions</a></li>
+<li><a class="reference internal" href="#reference" id="id5">Reference</a><ul>
+<li><a class="reference internal" href="#member-functions" id="id6">Member Functions</a></li>
+<li><a class="reference internal" href="#free-functions" id="id7">Free functions</a></li>
+<li><a class="reference internal" href="#exceptions" id="id8">Exceptions</a></li>
</ul>
</li>
</ul>
@@ -45,7 +44,7 @@
<div class="section" id="introduction">
<h1><a class="toc-backref" href="#id3">Introduction</a></h1>
<p>The Boost Property Map library specifies statically type-safe
-interfaces through which key-value pairs can be manipulated by
+interfaces through which key-value pairs can be manipulated by
generic algorithms. Typically, an algorithm that uses property maps is
parameterized on the types of the property maps it uses, and it
manipulates them using the interfaces specified by the
@@ -53,7 +52,7 @@
<p>The following generic function illustrates property map basics.</p>
<pre class="literal-block">
template <typename AgeMap, typename GPAMap>
-void
+void
manipulate_freds_info(AgeMap ages, GPAMap gpas) {
typedef typename boost::property_traits<AgeMap>::key_type name_type;
@@ -173,7 +172,7 @@
manipulate_freds_info(properties);
std::cout << "Fred's age: " << get(age_map,fred) << "\n"
- << "Fred's gpa: " << get(gpa_map,fred) << "\n";
+ << "Fred's gpa: " << get(gpa_map,fred) << "\n";
}
</pre>
<p>The code first creates two property maps using <tt class="docutils literal"><span class="pre">std::map</span></tt> and the
@@ -203,22 +202,22 @@
dynamic_properties()
dynamic_properties(
const boost::function<
- std::auto_ptr<dynamic_property_map> (
+ boost::shared_ptr<dynamic_property_map> (
const std::string&, const boost::any&, const boost::any&)
>& fn)
</pre>
<p>A <tt class="docutils literal"><span class="pre">dynamic_properties</span></tt> object can be constructed with a function object
-that, when called, creates a new property map. The library provides the
+that, when called, creates a new property map. The library provides the
<tt class="docutils literal"><span class="pre">ignore_other_properties</span></tt> function object, which lets the <tt class="docutils literal"><span class="pre">dynamic_properties</span></tt> object ignore any properties that it hasn't been prepared to record.
If an attempt is made
to <tt class="docutils literal"><span class="pre">put</span></tt> a key-value pair to a nonexistent <tt class="docutils literal"><span class="pre">dynamic_properties</span></tt> key,
then this function is called with the <tt class="docutils literal"><span class="pre">dynamic_properties</span></tt> key and the
intended property key and value . If <tt class="docutils literal"><span class="pre">dynamic_properties</span></tt> is
-default-constructed, such a <tt class="docutils literal"><span class="pre">put</span></tt> attempt throws
+default-constructed, such a <tt class="docutils literal"><span class="pre">put</span></tt> attempt throws
<tt class="docutils literal"><span class="pre">property_not_found</span></tt>.</p>
<pre class="literal-block">
template<typename PropertyMap>
-dynamic_properties&
+dynamic_properties&
property(const std::string& name, PropertyMap property_map)
</pre>
<p>This member function adds a property map to the set of maps contained,
@@ -226,7 +225,7 @@
<p>Requirements: <tt class="docutils literal"><span class="pre">PropertyMap</span></tt> must model Readable Property Map or
Read/Write Property Map.</p>
<pre class="literal-block">
-void insert(const std::string& name, std::auto_ptr<dynamic_property_map> pm)
+void insert(const std::string& name, boost::shared_ptr<dynamic_property_map> pm)
</pre>
<p>This member function directly adds a <tt class="docutils literal"><span class="pre">dynamic_property_map</span></tt>
to the collection, using <tt class="docutils literal"><span class="pre">name</span></tt> as its key.</p>
@@ -244,10 +243,10 @@
dynamic property maps held by the <tt class="docutils literal"><span class="pre">dynamic_properties</span></tt> object. It is used to
terminate traversals over the set of dynamic property maps</p>
<pre class="literal-block">
-iterator lower_bound(const std::string& name)
+iterator lower_bound(const std::string& name)
</pre>
<p>This member function returns an iterator that points to the first
-property map whose <tt class="docutils literal"><span class="pre">dynamic_properties</span></tt> key is <tt class="docutils literal"><span class="pre">name</span></tt>.
+property map whose <tt class="docutils literal"><span class="pre">dynamic_properties</span></tt> key is <tt class="docutils literal"><span class="pre">name</span></tt>.
Bear in mind that multiple property maps may have the same
<tt class="docutils literal"><span class="pre">dynamic_properties</span></tt> key, so long as their property map key types differ.</p>
<p>Invariant: The range [ lower_bound(name), end() ) contains every
@@ -256,17 +255,17 @@
<div class="section" id="free-functions">
<h2><a class="toc-backref" href="#id7">Free functions</a></h2>
<pre class="literal-block">
-std::auto_ptr<boost::dynamic_property_map>
+boost::shared_ptr<boost::dynamic_property_map>
ignore_other_properties(const std::string&,
- const boost::any&,
- const boost::any&)
+ const boost::any&,
+ const boost::any&)
</pre>
<p>When passed to the <tt class="docutils literal"><span class="pre">dynamic_properties</span></tt> constructor, this function
allows the <tt class="docutils literal"><span class="pre">dynamic_properties</span></tt> object to disregard attempts to put
values to unknown keys without signaling an error.</p>
<pre class="literal-block">
template<typename Key, typename Value>
-bool put(const std::string& name, dynamic_properties& dp, const Key& key,
+bool put(const std::string& name, dynamic_properties& dp, const Key& key,
const Value& value)
</pre>
<p>This function adds a key-value pair to the property map with the
@@ -275,7 +274,7 @@
a property map generator was supplied when the <tt class="docutils literal"><span class="pre">dynamic_properties</span></tt>
object was constructed, then that function is used to create a new
property map. If the generator fails to generate a property map
-(returns a null <tt class="docutils literal"><span class="pre">auto_ptr</span></tt>), then the <tt class="docutils literal"><span class="pre">put</span></tt> function returns
+(returns a null <tt class="docutils literal"><span class="pre">shared_ptr</span></tt>), then the <tt class="docutils literal"><span class="pre">put</span></tt> function returns
<tt class="docutils literal"><span class="pre">false</span></tt>. If, on the other hand, the <tt class="docutils literal"><span class="pre">dynamic_properties</span></tt> object
has no property map generator (meaning it was default-constructed),
then <tt class="docutils literal"><span class="pre">property_not_found</span></tt> is thrown. If a candidate property map is
@@ -283,7 +282,7 @@
thrown.</p>
<pre class="literal-block">
template<typename Value, typename Key>
-Value get(const std::string& name, const dynamic_properties& dp,
+Value get(const std::string& name, const dynamic_properties& dp,
const Key& key)
</pre>
<p>This function gets the value from the property-map whose namee is
@@ -308,7 +307,7 @@
2) For this expression to be valid, the key must be
associated with some value, otherwise the result is undefined.</p>
<pre class="literal-block">
-std::string get_string(const any& key)
+std::string get_string(const any& key)
</pre>
<p>Given a representation of a key, return the string representation
of the value associated with that key.</p>
@@ -319,7 +318,7 @@
associated with some value, otherwise the result is undefined.
3) The value type of the property map must model Output Streamable.</p>
<pre class="literal-block">
-void put(const any& key, const any& value)
+void put(const any& key, const any& value)
</pre>
<p>Given a representation of a key and a representation of a value, the
key and value are associated in the property map.</p>
@@ -332,11 +331,11 @@
case an error will be signaled. This is the runtime analogue of the
Readable Property Map concept.</p>
<pre class="literal-block">
-const std::type_info& key() const
+const std::type_info& key() const
</pre>
<p>Returns a <tt class="docutils literal"><span class="pre">type_info</span></tt> object that represents the property map's key type.</p>
<pre class="literal-block">
-const std::type_info& value() const
+const std::type_info& value() const
</pre>
<p>Returns a <tt class="docutils literal"><span class="pre">type_info</span></tt> object that represents the property map's value type.</p>
</div>
@@ -380,9 +379,11 @@
</div>
</div>
</div>
-<hr class="docutils footer" />
<div class="footer">
-Generated on: 2007-06-20 16:36 UTC.
+<hr class="footer" />
+Generated on: 2010-03-29 18:04 UTC.
+Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
+
</div>
</body>
</html>
Modified: trunk/libs/property_map/doc/dynamic_property_map.rst
==============================================================================
--- trunk/libs/property_map/doc/dynamic_property_map.rst (original)
+++ trunk/libs/property_map/doc/dynamic_property_map.rst 2010-03-29 14:26:22 EDT (Mon, 29 Mar 2010)
@@ -204,7 +204,7 @@
dynamic_properties()
dynamic_properties(
const boost::function<
- std::auto_ptr<dynamic_property_map> (
+ boost::shared_ptr<dynamic_property_map> (
const std::string&, const boost::any&, const boost::any&)
>& fn)
@@ -233,7 +233,7 @@
::
- void insert(const std::string& name, std::auto_ptr<dynamic_property_map> pm)
+ void insert(const std::string& name, boost::shared_ptr<dynamic_property_map> pm)
This member function directly adds a ``dynamic_property_map``
to the collection, using ``name`` as its key.
@@ -272,10 +272,10 @@
::
- std::auto_ptr<boost::dynamic_property_map>
+ boost::shared_ptr<boost::dynamic_property_map>
ignore_other_properties(const std::string&,
- const boost::any&,
- const boost::any&)
+ const boost::any&,
+ const boost::any&)
When passed to the ``dynamic_properties`` constructor, this function
allows the ``dynamic_properties`` object to disregard attempts to put
@@ -293,7 +293,7 @@
a property map generator was supplied when the ``dynamic_properties``
object was constructed, then that function is used to create a new
property map. If the generator fails to generate a property map
-(returns a null ``auto_ptr``), then the ``put`` function returns
+(returns a null ``shared_ptr``), then the ``put`` function returns
``false``. If, on the other hand, the ``dynamic_properties`` object
has no property map generator (meaning it was default-constructed),
then ``property_not_found`` is thrown. If a candidate property map is
Modified: trunk/libs/property_map/test/dynamic_properties_test.cpp
==============================================================================
--- trunk/libs/property_map/test/dynamic_properties_test.cpp (original)
+++ trunk/libs/property_map/test/dynamic_properties_test.cpp 2010-03-29 14:26:22 EDT (Mon, 29 Mar 2010)
@@ -18,16 +18,18 @@
#endif
#include <boost/test/minimal.hpp>
+#include <boost/smart_ptr.hpp>
#include <boost/property_map/dynamic_property_map.hpp>
#include <boost/property_map/property_map.hpp>
#include <map>
#include <iostream>
#include <string>
+#include <memory>
// generate a dynamic_property_map that maps strings to strings
// WARNING: This code leaks memory. For testing purposes only!
// WARNING: This code uses library internals. For testing purposes only!
-std::auto_ptr<boost::dynamic_property_map>
+boost::shared_ptr<boost::dynamic_property_map>
string2string_gen(const std::string& name,
const boost::any&,
const boost::any&) {
@@ -41,7 +43,7 @@
property_t property_map(*mymap);
- std::auto_ptr<boost::dynamic_property_map> pm(
+ boost::shared_ptr<boost::dynamic_property_map> pm(
new
boost::detail::dynamic_property_map_adaptor<property_t>(property_map));
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