[Libreoffice] Issues in VCL from boost::unordered_set and boost overriding std::vector?

Hey everybody,

From talking in IRC it looks like this email is probably not really going to
be needed, but just in case:

I pulled in all the latest changes from the git repository and ran into a
couple small problems in vcl (may be in other modules too, but they'll be
similar issues if so).

Firstly, since the move to boost::unordered_set from (if I remember
correctly) hash_map we have things like this cropping up:

Compiling: vcl/unx/headless/svptext.cxx
> /usr/local/src/libreoffice/clone/libs-gui/vcl/unx/headless/svptext.cxx: In
> member function 'virtual void PspKernInfo::Initialize() const':
> /usr/local/src/libreoffice/clone/libs-gui/vcl/unx/headless/svptext.cxx:197:
> error: 'class boost::unordered_set<ImplKernPairData,
> ExtraKernInfo::PairHash, ExtraKernInfo::PairEqual,
> std::allocator<ImplKernPairData> >' has no member named 'resize'
> dmake:  Error code 1, while making '../../unxlngx6.pro/slo/svptext.obj'


Easy fix, just delete the resize statement.


Another problem, and another easy fix, is types like the following:

Compiling: vcl/unx/headless/svppspgraphics.cxx
> In file included from
> /usr/local/src/libreoffice/clone/libs-gui/vcl/unx/headless/svppspgraphics.hxx:33,
>                  from
> /usr/local/src/libreoffice/clone/libs-gui/vcl/unx/headless/svppspgraphics.cxx:32:
> ../../inc/vcl/fontmanager.hxx:401: error: wrong number of template
> arguments (1, should be 2)
> /usr/local/src/libreoffice/solver/330/
> unxlngx6.pro/inc/boost/detail/container_fwd.hpp:80: error: provided for
> 'template<class T, class Allocator> struct std::vector'
> ../../inc/vcl/fontmanager.hxx:658: error: wrong number of template
> arguments (1, should be 2)
> /usr/local/src/libreoffice/solver/330/
> unxlngx6.pro/inc/boost/detail/container_fwd.hpp:80: error: provided for
> 'template<class T, class Allocator> struct std::vector'
> /usr/local/src/libreoffice/clone/libs-gui/vcl/unx/headless/svppspgraphics.cxx:
> In static member function 'static void
> PspGraphics::DoGetGlyphWidths(psp::fontID, bool, Int32Vector&,
> Ucs2UIntMap&)':
> /usr/local/src/libreoffice/clone/libs-gui/vcl/unx/headless/svppspgraphics.cxx:1072:
> error: no matching function for call to
> 'psp::PrintFontManager::getGlyphWidths(psp::fontID&, bool&, std::vector<int,
> std::allocator<int> >&, std::map<short unsigned int, unsigned int,
> std::less<short unsigned int>, std::allocator<std::pair<const short unsigned
> int, unsigned int> > >&)'
> ../../inc/vcl/fontmanager.hxx:656: note: candidates are: void
> psp::PrintFontManager::getGlyphWidths(psp::fontID, bool, int&,
> std::map<short unsigned int, unsigned int, std::less<short unsigned int>,
> std::allocator<std::pair<const short unsigned int, unsigned int> > >&)
> dmake:  Error code 1, while making '../../
> unxlngx6.pro/slo/svppspgraphics.obj'

Apparently (pointed out by JoeP) you just need to #include <vector> in order
to fix this issue, as apparently boost is somehow overriding std::vector but
explicitly including <vector> seems to fix the issue.


Chris Carpenter