Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2461/adobe-source/adobe/source
Modified Files:
eve.cpp
Log Message:
Silences some warnings when compiling with GCC (initialization order of member fields, unused variables)
Index: eve.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/source/eve.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** eve.cpp 13 Apr 2005 16:21:15 -0000 1.7
--- eve.cpp 15 Apr 2005 16:44:28 -0000 1.8
***************
*** 130,134 ****
explicit apply_flatten_t(slice_select_t select, adobe::eve_t::evaluate_options_t options)
! : select_m(select), options_m(options) { }
template <typename BeadIterator>
--- 130,134 ----
explicit apply_flatten_t(slice_select_t select, adobe::eve_t::evaluate_options_t options)
! : options_m(options), select_m(select) { }
template <typename BeadIterator>
***************
*** 898,903 ****
--last;
! const adobe::eve_t::calculate_data_t::slice_t& leading_gslice (first->geometry_m.slice_m[select]);
! const adobe::eve_t::calculate_data_t::slice_t& trailing_gslice (last->geometry_m.slice_m[select]);
adobe::eve_t::place_data_t::slice_t& leading_pslice (first->place_m.slice_m[select]);
adobe::eve_t::place_data_t::slice_t& trailing_pslice (last->place_m.slice_m[select]);
--- 898,904 ----
--last;
! // currently unused:
! // const adobe::eve_t::calculate_data_t::slice_t& leading_gslice (first->geometry_m.slice_m[select]);
! // const adobe::eve_t::calculate_data_t::slice_t& trailing_gslice (last->geometry_m.slice_m[select]);
adobe::eve_t::place_data_t::slice_t& leading_pslice (first->place_m.slice_m[select]);
adobe::eve_t::place_data_t::slice_t& trailing_pslice (last->place_m.slice_m[select]);
***************
*** 939,943 ****
for (child_iterator iter (first); iter != last; ++iter)
{
! const eve_t::calculate_data_t::slice_t& iter_gslice(iter->geometry_m.slice_m[select]);
eve_t::place_data_t::slice_t& iter_pslice(iter->place_m.slice_m[select]);
--- 940,945 ----
for (child_iterator iter (first); iter != last; ++iter)
{
! // currently unused:
! // const eve_t::calculate_data_t::slice_t& iter_gslice(iter->geometry_m.slice_m[select]);
eve_t::place_data_t::slice_t& iter_pslice(iter->place_m.slice_m[select]);
***************
*** 1200,1204 ****
void eve_t::view_proxy_t::adjust_with(child_iterator first, child_iterator last, slice_select_t select)
{
! const eve_t::calculate_data_t::slice_t& gslice(geometry_m.slice_m[select]);
eve_t::place_data_t::slice_t& pslice(place_m.slice_m[select]);
--- 1202,1207 ----
void eve_t::view_proxy_t::adjust_with(child_iterator first, child_iterator last, slice_select_t select)
{
! // currently unused
! // const eve_t::calculate_data_t::slice_t& gslice(geometry_m.slice_m[select]);
eve_t::place_data_t::slice_t& pslice(place_m.slice_m[select]);
***************
*** 1261,1265 ****
void eve_t::view_proxy_t::adjust_cross(child_iterator first, child_iterator last, slice_select_t select)
{
! const eve_t::calculate_data_t::slice_t& gslice(geometry_m.slice_m[select]);
eve_t::place_data_t::slice_t& pslice(place_m.slice_m[select]);
--- 1264,1269 ----
void eve_t::view_proxy_t::adjust_cross(child_iterator first, child_iterator last, slice_select_t select)
{
! // currently unused
! // const eve_t::calculate_data_t::slice_t& gslice(geometry_m.slice_m[select]);
eve_t::place_data_t::slice_t& pslice(place_m.slice_m[select]);
***************
*** 1275,1279 ****
for (child_iterator iter(first); iter != last; ++iter)
{
! const eve_t::calculate_data_t::slice_t& iter_gslice (iter->geometry_m.slice_m[select]);
eve_t::place_data_t::slice_t& iter_pslice(iter->place_m.slice_m[select]);
--- 1279,1284 ----
for (child_iterator iter(first); iter != last; ++iter)
{
! // currently unused:
! // const eve_t::calculate_data_t::slice_t& iter_gslice (iter->geometry_m.slice_m[select]);
eve_t::place_data_t::slice_t& iter_pslice(iter->place_m.slice_m[select]);
***************
*** 1538,1545 ****
eve_t::calculate_data_t::calculate_data_t() :
- placement_m(eve_t::place_leaf),
indent_m(0),
create_m(true),
! spacing_m(2, 0)
{
spacing_m[1] = 10; /* REVISIT FIXED VALUE container_spacing */
--- 1543,1550 ----
eve_t::calculate_data_t::calculate_data_t() :
indent_m(0),
create_m(true),
! spacing_m(2, 0),
! placement_m(eve_t::place_leaf)
{
spacing_m[1] = 10; /* REVISIT FIXED VALUE container_spacing */
|
