config.h   config.h 
skipping to change at line 15 skipping to change at line 15
*/ */
/* This file is automatically processed by configure. */ /* This file is automatically processed by configure. */
#ifndef CUTL_DETAILS_CONFIG_H #ifndef CUTL_DETAILS_CONFIG_H
#define CUTL_DETAILS_CONFIG_H #define CUTL_DETAILS_CONFIG_H
/* #undef LIBCUTL_DISABLE_THREADS */ /* #undef LIBCUTL_DISABLE_THREADS */
/* #undef LIBCUTL_STATIC_LIB */ /* #undef LIBCUTL_STATIC_LIB */
/* #undef LIBCUTL_EXTERNAL_BOOST */ /* #undef LIBCUTL_EXTERNAL_BOOST */
/* #undef LIBCUTL_EXTERNAL_EXPAT */
#define LIBCUTL_BYTEORDER 1234
#endif /* CUTL_DETAILS_CONFIG_H */ #endif /* CUTL_DETAILS_CONFIG_H */
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 cxx-indenter.txx   cxx-indenter.txx 
skipping to change at line 377 skipping to change at line 377
} }
ensure_new_line (); ensure_new_line ();
} }
} }
else else
defaulting = true; defaulting = true;
break; break;
} }
case ',':
{
if (construct_ == con_other)
{
// Handling '},' case.
//
bool brace (false);
if (hold_.size () > 1 && hold_.back () == '\n')
{
bool pop_nl (false);
for (typename hold::reverse_iterator
i (hold_.rbegin ()), e (hold_.rend ());
i != e; ++i)
{
if (*i != '\n')
{
if (*i == '}')
brace = pop_nl = true;
break;
}
}
if (pop_nl)
while (hold_.back () == '\n')
hold_.pop_back ();
}
output_indentation ();
write (c);
position_++;
if (brace)
hold_.push_back ('\n');
}
else
defaulting = true;
break;
}
case ' ': case ' ':
{ {
if (construct_ == con_other) if (construct_ == con_other)
{ {
// Handling '} foo_;' case. // Handling '} foo_;' case.
// //
if (hold_.size () > 1 && hold_.back () == '\n') if (hold_.size () > 1 && hold_.back () == '\n')
{ {
bool pop_nl (false); bool pop_nl (false);
 End of changes. 1 change blocks. 
0 lines changed or deleted 43 lines changed or added


 graph.hxx   graph.hxx 
skipping to change at line 89 skipping to change at line 89
new_node (A0 const&, A1 const&, A2 const&, A3 const&, A4 const&, new_node (A0 const&, A1 const&, A2 const&, A3 const&, A4 const&,
A5 const&, A6 const&, A7 const&, A8 const&); A5 const&, A6 const&, A7 const&, A8 const&);
template <typename T, typename A0, typename A1, typename A2, template <typename T, typename A0, typename A1, typename A2,
typename A3, typename A4, typename A5, typename A6, typename A3, typename A4, typename A5, typename A6,
typename A7, typename A8, typename A9> typename A7, typename A8, typename A9>
T& T&
new_node (A0 const&, A1 const&, A2 const&, A3 const&, A4 const&, new_node (A0 const&, A1 const&, A2 const&, A3 const&, A4 const&,
A5 const&, A6 const&, A7 const&, A8 const&, A9 const&); A5 const&, A6 const&, A7 const&, A8 const&, A9 const&);
// Non-const versions.
//
template <typename T, typename A0>
T&
new_node (A0&);
template <typename T, typename A0, typename A1>
T&
new_node (A0&, A1&);
template <typename T, typename A0, typename A1, typename A2>
T&
new_node (A0&, A1&, A2&);
public: public:
template <typename T, typename L, typename R> template <typename T, typename L, typename R>
T& T&
new_edge (L&, R&); new_edge (L&, R&);
template <typename T, typename L, typename R, template <typename T, typename L, typename R,
typename A0> typename A0>
T& T&
new_edge (L&, R&, A0 const&); new_edge (L&, R&, A0 const&);
 End of changes. 1 change blocks. 
0 lines changed or deleted 14 lines changed or added


 graph.txx   graph.txx 
skipping to change at line 154 skipping to change at line 154
A4 const& a4, A5 const& a5, A6 const& a6, A7 const& a7, A4 const& a4, A5 const& a5, A6 const& a6, A7 const& a7,
A8 const& a8, A9 const& a9) A8 const& a8, A9 const& a9)
{ {
shared_ptr<T> node ( shared_ptr<T> node (
new (shared) T (a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); new (shared) T (a0, a1, a2, a3, a4, a5, a6, a7, a8, a9));
nodes_[node.get ()] = node; nodes_[node.get ()] = node;
return *node; return *node;
} }
// Non-const versions.
//
template <typename N, typename E>
template <typename T, typename A0>
T& graph<N, E>::
new_node (A0& a0)
{
shared_ptr<T> node (new (shared) T (a0));
nodes_[node.get ()] = node;
return *node;
}
template <typename N, typename E>
template <typename T, typename A0, typename A1>
T& graph<N, E>::
new_node (A0& a0, A1& a1)
{
shared_ptr<T> node (new (shared) T (a0, a1));
nodes_[node.get ()] = node;
return *node;
}
template <typename N, typename E>
template <typename T, typename A0, typename A1, typename A2>
T& graph<N, E>::
new_node (A0& a0, A1& a1, A2& a2)
{
shared_ptr<T> node (new (shared) T (a0, a1, a2));
nodes_[node.get ()] = node;
return *node;
}
// Edges. // Edges.
// //
template <typename N, typename E> template <typename N, typename E>
template <typename T, typename L, typename R> template <typename T, typename L, typename R>
T& graph<N, E>:: T& graph<N, E>::
new_edge (L& l, R& r) new_edge (L& l, R& r)
{ {
shared_ptr<T> edge (new (shared) T); shared_ptr<T> edge (new (shared) T);
edges_[edge.get ()] = edge; edges_[edge.get ()] = edge;
 End of changes. 1 change blocks. 
0 lines changed or deleted 35 lines changed or added


 path.hxx   path.hxx 
skipping to change at line 277 skipping to change at line 277
return path_ < x.path_; return path_ < x.path_;
} }
public: public:
string_type string_type
string () const string () const
{ {
return path_; return path_;
} }
// If possible, return a POSIX representation of the path. For exampl
e,
// for a Windows path in the form foo\bar this function will return
// foo/bar. If it is not possible to create a POSIX representation fo
r
// this path (e.g., c:\foo), this function will throw the invalid_pat
h
// exception.
//
string_type
posix_string () const;
private: private:
void void
init (); init ();
#ifdef _WIN32 #ifdef _WIN32
static C static C
tolower (C); tolower (C);
#endif #endif
private: private:
 End of changes. 1 change blocks. 
0 lines changed or deleted 12 lines changed or added


 path.ixx   path.ixx 
skipping to change at line 46 skipping to change at line 46
template <typename C> template <typename C>
inline basic_path<C>& basic_path<C>:: inline basic_path<C>& basic_path<C>::
complete () complete ()
{ {
if (relative ()) if (relative ())
*this = current () / *this; *this = current () / *this;
return *this; return *this;
} }
#ifndef _WIN32
template <typename C>
inline typename basic_path<C>::string_type basic_path<C>::
posix_string () const
{
return string ();
}
#endif
#ifdef _WIN32 #ifdef _WIN32
template <> template <>
inline char basic_path<char>:: inline char basic_path<char>::
tolower (char c) tolower (char c)
{ {
return std::tolower (c); return std::tolower (c);
} }
template <> template <>
inline wchar_t basic_path<wchar_t>:: inline wchar_t basic_path<wchar_t>::
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 path.txx   path.txx 
skipping to change at line 67 skipping to change at line 67
// Weed out paths like ".txt" and "/.txt" // Weed out paths like ".txt" and "/.txt"
// //
if (i > 1 && !traits::is_separator (path_[i - 2])) if (i > 1 && !traits::is_separator (path_[i - 2]))
{ {
return basic_path (path_.c_str (), i - 1); return basic_path (path_.c_str (), i - 1);
} }
else else
return *this; return *this;
} }
#ifdef _WIN32
template <typename C>
typename basic_path<C>::string_type basic_path<C>::
posix_string () const
{
if (absolute ())
throw invalid_basic_path<C> (path_);
string_type r (path_);
// Translate Windows-style separators to the POSIX ones.
//
for (size_type i (0), n (r.size ()); i != n; ++i)
if (r[i] == '\\')
r[i] = '/';
return r;
}
#endif
template <typename C> template <typename C>
basic_path<C>& basic_path<C>:: basic_path<C>& basic_path<C>::
operator/= (basic_path<C> const& r) operator/= (basic_path<C> const& r)
{ {
if (r.absolute ()) if (r.absolute ())
throw invalid_basic_path<C> (r.path_); throw invalid_basic_path<C> (r.path_);
if (path_.empty () || r.path_.empty ()) if (path_.empty () || r.path_.empty ())
{ {
path_ += r.path_; path_ += r.path_;
 End of changes. 1 change blocks. 
0 lines changed or deleted 20 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/