polymorphic-info.hxx   polymorphic-info.hxx 
skipping to change at line 63 skipping to change at line 63
call_persist, // arg is not used. call_persist, // arg is not used.
call_update, // arg is not used. call_update, // arg is not used.
call_find, // arg points to object id. call_find, // arg points to object id.
call_reload, // arg is not used. call_reload, // arg is not used.
call_load, // arg points to depth. call_load, // arg points to depth.
call_erase // arg points to object id. call_erase // arg points to object id.
}; };
typedef pointer_type (*create_function) (); typedef pointer_type (*create_function) ();
typedef bool (*dispatch_function) ( typedef bool (*dispatch_function) (
call_type, database&, const root_type*, const void* arg); call_type, odb::database&, const root_type*, const void* arg);
typedef void (*delayed_loader_function) ( typedef void (*delayed_loader_function) (
database&, const id_type&, root_type&); odb::database&, const id_type&, root_type&);
public: public:
polymorphic_concrete_info (const std::type_info& t, polymorphic_concrete_info (const std::type_info& t,
const polymorphic_abstract_info<R>* b, const polymorphic_abstract_info<R>* b,
const discriminator_type& d, const discriminator_type& d,
create_function cf, create_function cf,
dispatch_function df, dispatch_function df,
delayed_loader_function dlf) delayed_loader_function dlf)
: polymorphic_abstract_info<R> (t, b), : polymorphic_abstract_info<R> (t, b),
discriminator (d), discriminator (d),
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 query-dynamic.txx   query-dynamic.txx 
skipping to change at line 85 skipping to change at line 85
template <typename T> template <typename T>
template <typename I> template <typename I>
query_base query_column<T>:: query_base query_column<T>::
in_range (I i, I end) const in_range (I i, I end) const
{ {
query_base q (native_info); query_base q (native_info);
std::size_t n (0); std::size_t n (0);
for (; i != end; ++i, ++n) for (; i != end; ++i, ++n)
q.append_val (*i, native_info); q.append_val<T> (*i, native_info); // Force implicit conversion.
q.append (query_base::clause_part::op_in, n); q.append (query_base::clause_part::op_in, n);
return q; return q;
} }
} }
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 vector-impl.ixx   vector-impl.ixx 
// file : odb/vector-impl.ixx // file : odb/vector-impl.ixx
// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC // copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifdef ODB_CXX11 #ifdef ODB_CXX11
# include <utility> // std::swap # include <utility> // std::swap, std::move
#else #else
# include <algorithm> // std::swap # include <algorithm> // std::swap
#endif #endif
namespace odb namespace odb
{ {
// vector_impl // vector_impl
// //
inline vector_impl:: inline vector_impl::
vector_impl () vector_impl ()
skipping to change at line 140 skipping to change at line 140
{ {
std::size_t r (i % 4); std::size_t r (i % 4);
i /= 4; i /= 4;
unsigned char v (static_cast<unsigned char> (s)); unsigned char v (static_cast<unsigned char> (s));
v <<= shift_[r]; v <<= shift_[r];
data_[i] = (data_[i] & ~mask_[r]) | v; data_[i] = (data_[i] & ~mask_[r]) | v;
} }
// vector_base // vector_base
// //
inline void vector_base:: inline void vector_base::
_arm (transaction& t) const _arm (transaction& t) const
{ {
tran_ = &t; tran_ = &t;
t.callback_register (&rollback, t.callback_register (&rollback,
const_cast<vector_base*> (this), const_cast<vector_base*> (this),
transaction::event_rollback, transaction::event_rollback,
0, 0,
&tran_); &tran_);
} }
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 version.hxx   version.hxx 
skipping to change at line 34 skipping to change at line 34
// 3.0.0.b2 02999952 // 3.0.0.b2 02999952
// //
// ODB interface version: minor, major, and alpha/beta versions. // ODB interface version: minor, major, and alpha/beta versions.
// //
#define ODB_VERSION 20200 #define ODB_VERSION 20200
#define ODB_VERSION_STR "2.2" #define ODB_VERSION_STR "2.2"
// libodb version: interface version plus the bugfix version. // libodb version: interface version plus the bugfix version.
// //
#define LIBODB_VERSION 2020200 #define LIBODB_VERSION 2020300
#define LIBODB_VERSION_STR "2.2.2" #define LIBODB_VERSION_STR "2.2.3"
#include <odb/post.hxx> #include <odb/post.hxx>
#endif // ODB_VERSION_HXX #endif // ODB_VERSION_HXX
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 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/