Boost logo

Boost :

From: Markus Schöpflin (markus.schoepflin_at_[hidden])
Date: 2007-09-12 05:22:48


Hello,

attached patch fixes the following problems encountered when compiling
library_status.cpp on Tru64/CXX:

1) Fix the definition of subcolumns_t, the key type of std::map must be
assignable, hence const string is not a valid key type.

2) Make empty_element static, as find_element() returns a reference to it.

3) Swap static and const in the declaration of empty_string to avoid a
compiler warning.

Could anybody please be so kind and apply the patch?

Thanks, Markus

Index: boost/tools/regression/library_status.cpp
===================================================================
--- boost/tools/regression/library_status.cpp (revision 39207)
+++ boost/tools/regression/library_status.cpp (working copy)
@@ -89,7 +89,7 @@
     struct col_node {
         int rows, cols;
         bool is_leaf_directory;
- typedef std::map<const std::string, col_node> subcolumns_t;
+ typedef std::map<std::string, col_node> subcolumns_t;
         subcolumns_t m_subcolumns;
         bool operator<(const col_node &cn) const;
         col_node() :
@@ -222,7 +222,7 @@
     const xml::element & find_element(
         const xml::element & root, const string & name )
     {
- const xml::element empty_element;
+ static const xml::element empty_element;
         xml::element_list::const_iterator itr;
         for ( itr = root.elements.begin();
             itr != root.elements.end() && (*itr)->name != name;
@@ -245,7 +245,7 @@
             if(atr->name == attribute_name)
                 return atr->value;
         }
- const static string empty_string;
+ static const string empty_string;
         return empty_string;
     }
 


Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk