[Monotone-devel] Monotone 0.43dev build error, paths.hh missing

[Tero Koskinen]

Hi,

It seems that merge_content.hh is missing #include "paths.hh".

When compiling rev d24b59732a5b3293592457cba013c8f8b716a875, I get error:
        if g++  -I. -I. -I.   -I/usr/local/include -I/home/tkoskine/libraries/bo
tan-18/include -I/usr/local//include -I/usr/local/include      -g -I/usr/local/i
nclude  -g -O2 -Wall -W -Wno-unused -MT merge_roster.o -MD -MP -MF "$depbase.Tpo
" -c -o merge_roster.o merge_roster.cc; \
        then mv -f "$depbase.Tpo" "$depbase.Po"; else rm -f "$depbase.Tpo"; exit
 1; fi
In file included from merge_roster.hh:18,
                 from merge_roster.cc:12:
/usr/include/g++/bits/stl_pair.h: In instantiation of `std::pair<const file_id, 
file_path>':
/usr/include/g++/bits/stl_tree.h:123:   instantiated from `std::_Rb_tree_node<st
d::pair<const file_id, file_path> >'
/usr/include/g++/bits/stl_alloc.h:242:   instantiated from `static void std::__s
imple_alloc<_Tp, _Alloc>::deallocate(_Tp*, long unsigned int) [with _Tp = std::_
Rb_tree_node<std::pair<const file_id, file_path> >, _Alloc = std::__default_allo
c_template<true, 0>]'
/usr/include/g++/bits/stl_tree.h:567:   instantiated from `void std::_Rb_tree_al
loc_base<_Tp, _Alloc, true>::_M_put_node(std::_Rb_tree_node<_Val>*) [with _Tp = 
std::pair<const file_id, file_path>, _Alloc = std::allocator<std::pair<const fil
e_id, file_path> >]'
/usr/include/g++/bits/stl_tree.h:580:   instantiated from `std::_Rb_tree_base<_T
p, _Alloc>::~_Rb_tree_base() [with _Tp = std::pair<const file_id, file_path>, _A
lloc = std::allocator<std::pair<const file_id, file_path> >]'
/usr/include/g++/bits/stl_tree.h:748:   instantiated from `std::_Rb_tree<_Key, _
Val, _KeyOfValue, _Compare, _Alloc>::~_Rb_tree() [with _Key = file_id, _Val = st
d::pair<const file_id, file_path>, _KeyOfValue = std::_Select1st<std::pair<const
 file_id, file_path> >, _Compare = std::less<file_id>, _Alloc = std::allocator<s
td::pair<const file_id, file_path> >]'
merge_content.hh:107:   instantiated from here
/usr/include/g++/bits/stl_pair.h:74: error: `std::pair<_T1, _T2>::second' has 
   incomplete type
rev_types.hh:53: error: forward declaration of `struct file_path'
gmake[1]: *** [merge_roster.o] Error 1
gmake[1]: Leaving directory `/home/tkoskine/work/monotone/trunk'
gmake: *** [all] Error 2


Following diff fixes build for me:
#
# old_revision [d24b59732a5b3293592457cba013c8f8b716a875]
#
# patch "merge_content.hh"
#  from [119dac7660310c581b280923d4c5000266f0e54f]
#    to [f686979a4a2f6af3912880b91d8c9fea3be2db06]
#
============================================================
--- merge_content.hh    119dac7660310c581b280923d4c5000266f0e54f
+++ merge_content.hh    f686979a4a2f6af3912880b91d8c9fea3be2db06
@@ -13,6 +13,7 @@
 
 #include "vocab.hh"
 #include "rev_types.hh"
+#include "paths.hh"
 
 class database;
 class lua_hooks;



-- 
Tero Koskinen <address@hidden>