Hi everybody,

curiosity killed the cat. And so I tried to run lyx this evening...

Unfortunately, I had to patch the code at various places for that my
compiler accepted the sources. Below find a list of diffs listed by 'cvs
diff'. You can put the changes into your repository - or ignore them.
Except for the problem with struct language (Sun CC: It is not allowed
to initialize a class by = { ... } ), the modifications are small and I
can repeat them at any time. Meanwhile they are well-known friends to me
:-)

Michael


===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView_pimpl.C,v
retrieving revision 1.12
diff -r1.12 BufferView_pimpl.C
472c472
<       pair<double, double> p = workarea->getScrollbarBounds();
---
>       pair<float, float> p = workarea->getScrollbarBounds();
Index: src/language.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/language.C,v
retrieving revision 1.4
diff -r1.4 language.C
9c9
< Language ignore_lang = {"ignore", "Ignore", false};
---
> Language ignore_lang( "ignore", "Ignore", false );
Index: src/language.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/language.h,v
retrieving revision 1.5
diff -r1.5 language.h
8a9,12
>         Language() {};
>       Language( string lang, string display, bool RightToLeft ) :
>          lang( lang ), display( display ), RightToLeft( RightToLeft ) {};
>
Index:
src/layout.C                                                                           
         
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/layout.C,v
retrieving revision 1.24
diff -r1.24 layout.C
1330c1330
<                       return make_pair(true, cit - classlist.begin());
---
>                       return make_pair(true, static_cast<unsigned>( cit - 
>classlist.begin()));
1359c1359
<               return make_pair(true, LYX_DUMMY_LAYOUT);
---
>               return make_pair(true, static_cast< unsigned >( LYX_DUMMY_LAYOUT ) );
Index: src/lyx_gui_misc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_gui_misc.C,v
retrieving revision 1.20
diff -r1.20 lyx_gui_misc.C
399c399
<         return make_pair<bool, string>(true, tmp);
---
>         return make_pair<bool, string>(true, string( tmp ));
Index: src/lyx_main.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_main.C,v
retrieving revision 1.34
diff -r1.34 lyx_main.C
35a36
> using std::signal;
Index: src/lyxparagraph.h                
     
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxparagraph.h,v
retrieving revision 1.33
diff -r1.33 lyxparagraph.h
515c515
< private:
---
> public:
525a526
> private:
Index: src/text2.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text2.C,v
retrieving revision 1.57
diff -r1.57 text2.C
3210c3210
< #warning Remove this when verified working (Jug 20000413)
---
> // warning Remove this when verified working (Jug 20000413)
Index: src/mathed/math_symbols.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_symbols.C,v
retrieving revision 1.26
diff -r1.26 math_symbols.C
546c546
<       char * sx = strstr(data[2], "FFFFFFFF");
---
>       char * sx = const_cast< char * >( strstr(data[2], "FFFFFFFF") );

Reply via email to