On Wed, Mar 22, 2000 at 04:07:40PM +0100, Jean-Marc Lasgouttes wrote:
> >>>>> "Albert" == Albert Chin-A-Young <[EMAIL PROTECTED]> writes:
>
> Albert> Just tried compiling lyx 1.1.4fix2 on Solaris 2.6 with Sun CC
> Albert> 5.0: CC -DHAVE_CONFIG_H -I. -I. -I../../src -I../../images
> Albert> -I./../ -I/opt/TWWfsw/libxforms/include
> Albert> -I/opt/TWWfsw/xpm/include -I/usr/openwin/include -xO3 -c
> Albert> math_symbols.C -o math_symbols.o
> Albert> "../../src/insets/insetbib.h", line 132: Warning:
> Albert> InsetBibtex::display hides the virtual function
> Albert> Inset::display(bool). "math_symbols.C", line 545: Error:
> Albert> Cannot use const char* to initialize char*. 1 Error(s) and 1
> Albert> Warning(s) detected.
>
> Albert> According to NEWS: ... Many changes have also been done to
> Albert> help compile LyX with Sun CC 5.0 and SGI STL 3.2.
>
> Albert> Has 1.1.4 been verified to compile with Sun CC 5.0? I'm using
> Albert> CC=cc CFLAGS="-mr -Qn -xdepend -xO3" CXX=CC CXXFLAGS=-xO3.
>
> The changes that were compatible with other compilers are in. There is
> even a test in configurefor solaris7 broken (IMO) putenv() argument.
> However, there are still fixes that have not been done to the source,
> partly because we do not know how to do it right, or partly because we
> forgot about them.
>
> Patches would be appreciated. Or maybe CC options to make it less
> strict.
Ok, I've attached two patches to help. I'm now stuck at src/layout.C.
Can anyone help?
CC -DHAVE_CONFIG_H -I. -I. -I. -I../images
-I/opt/TWWfsw/libxforms/include -I/opt/TWWfsw/xpm/include
-I/usr/openwin/include -xO3 -c layout.C
"layout.C", line 1217: Error: Cannot use std::pair<bool, int> to
initialize std::pair<bool, unsigned>.
"layout.C", line 1246: Error: Cannot use std::pair<bool, int> to
initialize std::pair<bool, unsigned>.
2 Error(s) detected.
--
albert chin ([EMAIL PROTECTED])
-- snip snip
--- src/mathed/math_symbols.C.orig Tue Mar 28 17:59:10 2000
+++ src/mathed/math_symbols.C Tue Mar 28 19:17:18 2000
@@ -542,7 +542,7 @@
XpmCreateDataFromImage(fl_display, const_cast<char***>(&data), sbima, sbima,
0);
// Dirty hack to get blue symbols quickly
- char * sx = strstr(data[2], "FFFFFFFF");
+ const char * sx = strstr(<const_cast<char *>(data[2]), "FFFFFFFF");
if (sx) {
for (int k = 0; k < 8; ++k) sx[k] = '0';
}
--- src/bmtable.h.orig Mon Jan 17 14:04:31 2000
+++ src/bmtable.h Wed Mar 29 07:19:43 2000
@@ -23,11 +23,11 @@
{
#endif
-///
+/**/
#define FL_BMTABLE 1500
-/// A flat bitmap table
+/* A flat bitmap table */
#define FL_BMTABLE_FLAT 0
-/// A grided bitmap table
+/* A grided bitmap table */
#define FL_BMTABLE_GRID 1
@@ -40,25 +40,25 @@
#define FL_BMTABLE_BOXTYPE FL_UP_BOX
-///
+/**/
FL_OBJECT *fl_create_bmtable(int, FL_Coord, FL_Coord,
FL_Coord, FL_Coord, char const *);
-///
+/**/
FL_OBJECT *fl_add_bmtable(int, FL_Coord, FL_Coord,
FL_Coord, FL_Coord, char const *);
/** Same as fl_get_button_numb() */
int fl_get_bmtable_numb(FL_OBJECT *ob);
-///
+/**/
void fl_set_bmtable(FL_OBJECT *, int pushed, int pos);
/** Number of columns and rows, and the background bitmap */
void fl_set_bmtable_data(FL_OBJECT *, int, int, int, int , unsigned char const *);
-///
+/**/
void fl_set_bmtable_pixmap_data(FL_OBJECT *, int, int, char **);
-///
+/**/
void fl_set_bmtable_file(FL_OBJECT *, int, int, char const *);
-///
+/**/
void fl_set_bmtable_pixmap_file(FL_OBJECT *, int, int, char const *);
/** Adjust bitmap origin (ox, oy) and cell dimensions (dx, dy) incrementally */
@@ -66,7 +66,7 @@
/** The number of items is by default nc x nr, but you can change it */
void fl_set_bmtable_maxitems(FL_OBJECT *, int);
-///
+/**/
int fl_get_bmtable_maxitems(FL_OBJECT *);
/** Returns the index of the selected item or -1 if none was selected */
