Re: [Libpdfxx-devel] git merge and boost problem

[Matchman <mat...@gm...>]

Glad to hear that.

On Thu, Jul 29, 2010 at 10:55 AM, lj8888 <lj...@us...> wrote:
> Hi Match,
> Looks good with your latest revision. No errors any more. Thanks.
> Larry
>
> On Thu, Jul 22, 2010 at 11:42 PM, Matchman <mat...@gm...> wrote:
>>
>> Larry,
>>
>> Thanks for reporting this. I was not using the latest boost library
>> right now. I will try using 1.42 later.
>>
>> Match
>>
>> On Fri, Jul 23, 2010 at 10:12 AM, lj8888 <lj...@us...>
>> wrote:
>> > Hi Match,
>> > With your newest commit I am still getting some compile errors for
>> > libpdfdoc
>> > (see below):
>> > 2>Win32FontDb.cpp
>> > 1>..\libpdfxx\libpdfdoc\src\font\Win32FontDb.cpp(101) : error C2440:
>> > '<function-style-cast>' : cannot convert from 'const char [25]' to
>> > 'pdf::FontException'
>> > 1>        No constructor could take the source type, or constructor
>> > overload
>> > resolution was ambiguous
>> > 1>..\libpdfxx\libpdfdoc\src\font\Win32FontDb.cpp(113) : error C2440:
>> > '<function-style-cast>' : cannot convert from 'boost::basic_format<Ch>'
>> > to
>> > 'pdf::FontException'
>> > 2>..\libpdfxx\libpdfdoc\src\font\Win32FontDb.cpp(101) : error C2440:
>> > '<function-style-cast>' : cannot convert from 'const char [25]' to
>> > 'pdf::FontException'
>> > 1>        with
>> > 1>        [
>> > 1>            Ch=char
>> > 1>        ]
>> > 1>        No constructor could take the source type, or constructor
>> > overload
>> > resolution was ambiguous
>> > 1>..\libpdfxx\libpdfdoc\src\font\Win32FontDb.cpp(118) : error C2440:
>> > '<function-style-cast>' : cannot convert from 'const char [37]' to
>> > 'pdf::FontException'
>> > 1>        No constructor could take the source type, or constructor
>> > overload
>> > resolution was ambiguous
>> > 2>        No constructor could take the source type, or constructor
>> > overload
>> > resolution was ambiguous
>> > 2>..\libpdfxx\libpdfdoc\src\font\Win32FontDb.cpp(113) : error C2440:
>> > '<function-style-cast>' : cannot convert from 'boost::basic_format<Ch>'
>> > to
>> > 'pdf::FontException'
>> > 2>        with
>> > 2>        [
>> > 2>            Ch=char
>> > 2>        ]
>> > 2>        No constructor could take the source type, or constructor
>> > overload
>> > resolution was ambiguous
>> > 2>..\libpdfxx\libpdfdoc\src\font\Win32FontDb.cpp(118) : error C2440:
>> > '<function-style-cast>' : cannot convert from 'const char [37]' to
>> > 'pdf::FontException'
>> > 2>        No constructor could take the source type, or constructor
>> > overload
>> > resolution was ambiguous
>> >
>> > Thanks,
>> > Larry
>> >
>> > On Thu, Jul 22, 2010 at 1:21 PM, Matchman <mat...@gm...> wrote:
>> >>
>> >> Hi Larry,
>> >>
>> >> On Fri, Jul 16, 2010 at 9:53 PM, lj8888 <lj...@us...>
>> >> wrote:
>> >> > Hi guys,
>> >> > Two questions:
>> >> > 1) what's a good way to resolve a merge error problem with git?
>> >> > Usually
>> >> > I
>> >> > get that when I am developing stuff and then there is a new project
>> >> > commit,
>> >> > which then would merge only with errors with my local replica. So far
>> >> > the
>> >> > only way to fix it was to delete my local copy and pull a new fresh
>> >> > copy
>> >> > from the project. I hope that there is a better way.
>> >>
>> >> Can you give me an example on the git error message when this happens?
>> >>
>> >> > 2) (more important) I am getting compile time errors for libpdfdoc
>> >> > with
>> >> > the
>> >> > latest commit from July 13:
>> >> > 1>C:\Program Files\boost\boost_1_42_0\boost/exception.hpp(9) : fatal
>> >> > error
>> >> > C1189: #error :  The header <boost/exception.hpp> has been
>> >> > deprecated.
>> >> > Please #include <boost/exception/all.hpp> instead.
>> >>
>> >> I have changed it to:
>> >>
>> >> #include <boost/exception/exception.hpp>
>> >> #include <boost/exception/info.hpp>
>> >>
>> >> Thanks.
>> >>
>> >> Match
>> >>
>> >>
>> >>
>> >> ------------------------------------------------------------------------------
>> >> This SF.net email is sponsored by Sprint
>> >> What will you do first with EVO, the first 4G phone?
>> >> Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
>> >> _______________________________________________
>> >> Libpdfxx-devel mailing list
>> >> Lib...@li...
>> >> https://lists.sourceforge.net/lists/listinfo/libpdfxx-devel
>> >
>> >
>>
>>
>> ------------------------------------------------------------------------------
>> This SF.net email is sponsored by Sprint
>> What will you do first with EVO, the first 4G phone?
>> Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
>> _______________________________________________
>> Libpdfxx-devel mailing list
>> Lib...@li...
>> https://lists.sourceforge.net/lists/listinfo/libpdfxx-devel
>
>