← Back to branch summary

~ubuntu-branches/ubuntu/wily/ruby-passenger/wily-proposed

« back to all changes in this revision

Viewing changes to ext/boost/exception/info.hpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2013-11-23 23:50:02 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20131123235002-8fdhsq7afj15o2z2
Tags: 4.0.25-1
http://bugs.debian.org/725591
* New upstream release.
* Refresh fix_install_path.patch.
* Build for Ruby 2.0 instead of 1.8. (Closes: #725591)
* Add fix_ftbfs_fortify_source.patch.
* Install passenger template files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/boost/exception/info.hpp
5
5
 
6
6
#ifndef UUID_8D22C4CA9CC811DCAA9133D256D89593
7
7
#define UUID_8D22C4CA9CC811DCAA9133D256D89593
8
 
#if defined(__GNUC__) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
 
8
#if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
9
9
#pragma GCC system_header
10
10
#endif
11
11
#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
24
24
    {
25
25
    template <class Tag,class T>
26
26
    inline
27
 
    typename enable_if<has_to_string<T>,std::string>::type
 
27
    std::string
 
28
    error_info_name( error_info<Tag,T> const & x )
 
29
        {
 
30
        return tag_type_name<Tag>();
 
31
        }
 
32
 
 
33
    template <class Tag,class T>
 
34
    inline
 
35
    std::string
28
36
    to_string( error_info<Tag,T> const & x )
29
37
        {
30
 
        return to_string(x.value());
 
38
        return '[' + error_info_name(x) + "] = " + to_string_stub(x.value()) + '\n';
31
39
        }
32
40
 
33
41
    template <class Tag,class T>
49
57
    inline
50
58
    std::string
51
59
    error_info<Tag,T>::
52
 
    tag_typeid_name() const
53
 
        {
54
 
        return tag_type_name<Tag>();
55
 
        }
56
 
 
57
 
    template <class Tag,class T>
58
 
    inline
59
 
    std::string
60
 
    error_info<Tag,T>::
61
 
    value_as_string() const
 
60
    name_value_string() const
62
61
        {
63
62
        return to_string_stub(*this);
64
63
        }
114
113
                    for( error_info_map::const_iterator i=info_.begin(),end=info_.end(); i!=end; ++i )
115
114
                        {
116
115
                        error_info_base const & x = *i->second;
117
 
                        tmp << '[' << x.tag_typeid_name() << "] = " << x.value_as_string() << '\n';
 
116
                        tmp << x.name_value_string();
118
117
                        }
119
118
                    tmp.str().swap(diagnostic_info_str_);
120
119
                    }