Menu
▾
▴
"a bunch of work to bring up to gcc-3.* and ivtools-1.0.*"
|
From: <joh...@ve...> - 2002-05-17 20:57:53
|
Patch: vhclmaps-020517-johnston-033
For: vhclmaps-0.7.5
Author: joh...@us...
Subject: a bunch of work to bring up to gcc-3.* and ivtools-1.0.*
Requires:
This is an intermediate patch to vhclmaps-0.7.5. To apply, cd to the
top-level directory of the vhclmaps source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- a bunch of work to bring up to gcc-3.* and ivtools-1.0.*
(not finished yet, just want to commit to cvs)
Index: top_vhclmaps/MANIFEST
diff -c top_vhclmaps/MANIFEST:1.1 top_vhclmaps/MANIFEST:1.2
*** top_vhclmaps/MANIFEST:1.1 Thu Dec 20 10:49:17 2001
--- ./MANIFEST Fri May 17 13:46:31 2002
***************
*** 257,262 ****
--- 257,264 ----
vhclmaps-0.7/src/MapServ/mapfunc.h
vhclmaps-0.7/src/MapServ/maphandler.c
vhclmaps-0.7/src/MapServ/maphandler.h
+ vhclmaps-0.7/src/MapServ/mapprojfunc.c
+ vhclmaps-0.7/src/MapServ/mapprojfunc.h
vhclmaps-0.7/src/MapServ/mapservdef.h
vhclmaps-0.7/src/MapUnidraw/Imakefile
vhclmaps-0.7/src/MapUnidraw/Makefile
Index: src_vhclmaps/Imakefile
diff -c src_vhclmaps/Imakefile:1.1 src_vhclmaps/Imakefile:1.2
*** src_vhclmaps/Imakefile:1.1 Thu Dec 20 10:49:19 2001
--- src/Imakefile Fri May 17 13:46:32 2002
***************
*** 94,100 ****
utmviewer \
Los \
LosServ \
- losserv \
ProjServ \
projserv \
ProjUnidraw \
--- 94,99 ----
***************
*** 125,131 ****
utmviewer \
Los \
LosServ \
- losserv \
ProjServ \
projserv \
ProjUnidraw \
--- 124,129 ----
Index: Map/mapcov.h
diff -c Map/mapcov.h:1.1 Map/mapcov.h:1.2
*** Map/mapcov.h:1.1 Thu Dec 20 10:49:24 2001
--- src/Map/mapcov.h Fri May 17 13:46:33 2002
***************
*** 26,31 ****
--- 26,33 ----
#ifndef mapcov_h
#define mapcov_h
+ #include <iosfwd>
+
#include <Map/mapfiles.h>
class MapEdge;
***************
*** 33,39 ****
class MapFeatureClass;
class MapLibrary;
class MapNode;
- class ostream;
class MapCoverage : public MapFiles {
protected:
--- 35,40 ----
Index: Map/mapdb.h
diff -c Map/mapdb.h:1.1 Map/mapdb.h:1.2
*** Map/mapdb.h:1.1 Thu Dec 20 10:49:24 2001
--- src/Map/mapdb.h Fri May 17 13:46:33 2002
***************
*** 26,35 ****
#ifndef mapdb_h
#define mapdb_h
#include <Map/mapfiles.h>
class MapLibrary;
- class ostream;
class MapDatabase : public MapFiles {
protected:
--- 26,36 ----
#ifndef mapdb_h
#define mapdb_h
+ #include <iosfwd>
+
#include <Map/mapfiles.h>
class MapLibrary;
class MapDatabase : public MapFiles {
protected:
Index: Map/mapfclass.h
diff -c Map/mapfclass.h:1.1 Map/mapfclass.h:1.2
*** Map/mapfclass.h:1.1 Thu Dec 20 10:49:24 2001
--- src/Map/mapfclass.h Fri May 17 13:46:33 2002
***************
*** 27,32 ****
--- 27,34 ----
#ifndef mapfclass_h
#define mapfclass_h
+ #include <iosfwd>
+
#include <Map/mapfiles.h>
#include <OS/table.h>
***************
*** 34,40 ****
class MapCoverage;
class MapFeature;
class MapFeatureClass;
- class ostream;
declareTable(MapFeatureTable,int,MapFeature*)
--- 36,41 ----
Index: Map/mapfeature.h
diff -c Map/mapfeature.h:1.1 Map/mapfeature.h:1.2
*** Map/mapfeature.h:1.1 Thu Dec 20 10:49:24 2001
--- src/Map/mapfeature.h Fri May 17 13:46:33 2002
***************
*** 29,34 ****
--- 29,36 ----
#ifndef mapfeature_h
#define mapfeature_h
+ #include <iosfwd>
+
#include <OS/enter-scope.h>
class AttributeList;
***************
*** 43,49 ****
class MapProjection;
class MapRaster;
class MapText;
- class ostream;
class MapFeature {
public:
--- 45,50 ----
Index: Map/mapfiles.h
diff -c Map/mapfiles.h:1.1 Map/mapfiles.h:1.2
*** Map/mapfiles.h:1.1 Thu Dec 20 10:49:24 2001
--- src/Map/mapfiles.h Fri May 17 13:46:33 2002
***************
*** 26,34 ****
#ifndef mapfile_h
#define mapfile_h
! #include <OS/types.h>
! class ostream;
class MapFiles {
protected:
--- 26,34 ----
#ifndef mapfile_h
#define mapfile_h
! #include <iosfwd>
! #include <OS/types.h>
class MapFiles {
protected:
Index: Map/maplib.h
diff -c Map/maplib.h:1.1 Map/maplib.h:1.2
*** Map/maplib.h:1.1 Thu Dec 20 10:49:24 2001
--- src/Map/maplib.h Fri May 17 13:46:33 2002
***************
*** 26,36 ****
#ifndef maplib_h
#define maplib_h
#include <Map/mapfiles.h>
class MapDatabase;
class MapCoverage;
- class ostream;
class MapLibrary : public MapFiles {
protected:
--- 26,37 ----
#ifndef maplib_h
#define maplib_h
+ #include <iosfwd>
+
#include <Map/mapfiles.h>
class MapDatabase;
class MapCoverage;
class MapLibrary : public MapFiles {
protected:
Index: VpfUtil/vpfdraw.h
diff -c VpfUtil/vpfdraw.h:1.1 VpfUtil/vpfdraw.h:1.2
*** VpfUtil/vpfdraw.h:1.1 Thu Dec 20 10:49:30 2001
--- src/VpfUtil/vpfdraw.h Fri May 17 13:46:35 2002
***************
*** 55,58 ****
int inner );
! #endif
\ No newline at end of file
--- 55,58 ----
int inner );
! #endif
Index: Vpf/vpffeature.h
diff -c Vpf/vpffeature.h:1.1 Vpf/vpffeature.h:1.2
*** Vpf/vpffeature.h:1.1 Thu Dec 20 10:49:35 2001
--- src/Vpf/vpffeature.h Fri May 17 13:46:36 2002
***************
*** 26,31 ****
--- 26,33 ----
#ifndef vpf_feature_h
#define vpf_feature_h
+ #include <iosfwd>
+
#include <Map/mapfeature.h>
#include <Vpf/vpf.h>
Index: Vpf/vpflib.c
diff -c Vpf/vpflib.c:1.1 Vpf/vpflib.c:1.2
*** Vpf/vpflib.c:1.1 Thu Dec 20 10:49:35 2001
--- src/Vpf/vpflib.c Fri May 17 13:46:36 2002
***************
*** 33,38 ****
--- 33,39 ----
}
#include <fstream.h>
+ #include <iostream.h>
#include <string.h>
#include <sys/stat.h>
***************
*** 445,451 ****
point_rec = read_point(i, nodetable);
FPointObj npoint(point_rec.x, point_rec.y);
! outfile.form(",%f,%f", point_rec.x, point_rec.y);
for (int j = 1; j < fc->nfeats(); j++) { // avoid first dummy tile
VpfFeature* tile = (VpfFeature*)fc->feature(j);
--- 446,452 ----
point_rec = read_point(i, nodetable);
FPointObj npoint(point_rec.x, point_rec.y);
! out_form2(outfile, ",%f,%f", point_rec.x, point_rec.y);
for (int j = 1; j < fc->nfeats(); j++) { // avoid first dummy tile
VpfFeature* tile = (VpfFeature*)fc->feature(j);
Index: Vpf/vpftiledfc.c
diff -c Vpf/vpftiledfc.c:1.1 Vpf/vpftiledfc.c:1.2
*** Vpf/vpftiledfc.c:1.1 Thu Dec 20 10:49:35 2001
--- src/Vpf/vpftiledfc.c Fri May 17 13:46:36 2002
***************
*** 353,359 ****
long ebr_xmax_pos = table_pos("XMAX", ebrtable);
long ebr_ymax_pos = table_pos("YMAX", ebrtable);
for (i=1;i<=ebrtable.nrows;i++) {
! float fx1, fy1, fx2, fy2;
ebrrow = get_row(i,ebrtable);
get_table_element(ebr_xmin_pos,ebrrow,ebrtable,&fx1,&n);
get_table_element(ebr_ymin_pos,ebrrow,ebrtable,&fy1,&n);
--- 353,359 ----
long ebr_xmax_pos = table_pos("XMAX", ebrtable);
long ebr_ymax_pos = table_pos("YMAX", ebrtable);
for (i=1;i<=ebrtable.nrows;i++) {
! double fx1, fy1, fx2, fy2;
ebrrow = get_row(i,ebrtable);
get_table_element(ebr_xmin_pos,ebrrow,ebrtable,&fx1,&n);
get_table_element(ebr_ymin_pos,ebrrow,ebrtable,&fy1,&n);
***************
*** 459,465 ****
long ebr_xmax_pos = table_pos("XMAX", ebrtable);
long ebr_ymax_pos = table_pos("YMAX", ebrtable);
for (i=1;i<=ebrtable.nrows;i++) {
! float fx1, fy1, fx2, fy2;
ebrrow = get_row(i,ebrtable);
get_table_element(ebr_xmin_pos,ebrrow,ebrtable,&fx1,&n);
get_table_element(ebr_ymin_pos,ebrrow,ebrtable,&fy1,&n);
--- 459,465 ----
long ebr_xmax_pos = table_pos("XMAX", ebrtable);
long ebr_ymax_pos = table_pos("YMAX", ebrtable);
for (i=1;i<=ebrtable.nrows;i++) {
! double fx1, fy1, fx2, fy2;
ebrrow = get_row(i,ebrtable);
get_table_element(ebr_xmin_pos,ebrrow,ebrtable,&fx1,&n);
get_table_element(ebr_ymin_pos,ebrrow,ebrtable,&fy1,&n);
***************
*** 540,549 ****
_x1 = dx; _y1 = dy; _x2 = dx; _y2 = dy;
}
else {
! _x1 = Math::min(_x1, dx);
! _y1 = Math::min(_y1, dy);
! _x2 = Math::max(_x2, dx);
! _y2 = Math::max(_y2, dy);
}
MapPoint* mp = new MapPoint();
mp->insert_points(1, &dx, &dy);
--- 540,549 ----
_x1 = dx; _y1 = dy; _x2 = dx; _y2 = dy;
}
else {
! _x1 = Math::min(_x1, (double)dx);
! _y1 = Math::min(_y1, (double)dy);
! _x2 = Math::max(_x2, (double)dx);
! _y2 = Math::max(_y2, (double)dy);
}
MapPoint* mp = new MapPoint();
mp->insert_points(1, &dx, &dy);
***************
*** 599,608 ****
_x1 = dx; _y1 = dy; _x2 = dx; _y2 = dy;
}
else {
! _x1 = Math::min(_x1, dx);
! _y1 = Math::min(_y1, dy);
! _x2 = Math::max(_x2, dx);
! _y2 = Math::max(_y2, dy);
}
MapText* mt = new MapText();
mt->text(anno_rec.text);
--- 599,608 ----
_x1 = dx; _y1 = dy; _x2 = dx; _y2 = dy;
}
else {
! _x1 = Math::min(_x1, (double)dx);
! _y1 = Math::min(_y1, (double)dy);
! _x2 = Math::max(_x2, (double)dx);
! _y2 = Math::max(_y2, (double)dy);
}
MapText* mt = new MapText();
mt->text(anno_rec.text);
Index: Dlg/dlgfeature.h
diff -c Dlg/dlgfeature.h:1.1 Dlg/dlgfeature.h:1.2
*** Dlg/dlgfeature.h:1.1 Thu Dec 20 10:49:38 2001
--- src/Dlg/dlgfeature.h Fri May 17 13:46:37 2002
***************
*** 29,34 ****
--- 29,36 ----
#ifndef dlgfeature_h
#define dlgfeature_h
+ #include <iosfwd>
+
#include <Map/mapfeature.h>
class DlgFeatureClass;
Index: Dem/usgsdem.h
diff -c Dem/usgsdem.h:1.1 Dem/usgsdem.h:1.2
*** Dem/usgsdem.h:1.1 Thu Dec 20 10:49:53 2001
--- src/Dem/usgsdem.h Fri May 17 13:46:39 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef usgsdem_h
#define usgsdem_h
+ #include <string.h>
+
/*
* USGS Digital Elevation Models - only handles 1-degree "DMA DEMs" for now
*/
Index: MapUnidraw/Imakefile
diff -c MapUnidraw/Imakefile:1.1 MapUnidraw/Imakefile:1.2
*** MapUnidraw/Imakefile:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/Imakefile Fri May 17 13:46:41 2002
***************
*** 33,39 ****
Obj26(mapviews)
Obj26(mapviewstate)
! #define Obj31(file) MakeObjectFromSrcFlags(file, -Uiv2_6_compatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj31(geoloctool)
Obj31(gscmd)
--- 33,39 ----
Obj26(mapviews)
Obj26(mapviewstate)
! #define Obj31(file) MakeObjectFromSrcFlags(file, -Div2_6_incompatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj31(geoloctool)
Obj31(gscmd)
***************
*** 52,58 ****
Obj31(thchooser)
#ifdef AceDir
! #define ObjACE(file) MakeObjectFromSrcFlags(file, -Uiv2_6_compatible -I$(TOP)/src/include $(TOP_CCINCLUDES) -D__ACE_INLINE__)
ObjACE(map-aceimport)
#endif
--- 52,58 ----
Obj31(thchooser)
#ifdef AceDir
! #define ObjACE(file) MakeObjectFromSrcFlags(file, -Div2_6_incompatible -I$(TOP)/src/include $(TOP_CCINCLUDES) -D__ACE_INLINE__)
ObjACE(map-aceimport)
#endif
Index: MapUnidraw/mapcatalog.c
diff -c MapUnidraw/mapcatalog.c:1.1 MapUnidraw/mapcatalog.c:1.2
*** MapUnidraw/mapcatalog.c:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapcatalog.c Fri May 17 13:46:41 2002
***************
*** 36,41 ****
--- 36,44 ----
#include <stdio.h>
#include <stream.h>
#include <ctype.h>
+ #if __GNUG__>=3
+ #include <fstream.h>
+ #endif
/*****************************************************************************/
Index: MapUnidraw/mapcatalog.h
diff -c MapUnidraw/mapcatalog.h:1.1 MapUnidraw/mapcatalog.h:1.2
*** MapUnidraw/mapcatalog.h:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapcatalog.h Fri May 17 13:46:41 2002
***************
*** 29,34 ****
--- 29,36 ----
#ifndef mapcatalog_h
#define mapcatalog_h
+ #include <iosfwd>
+
#include <OverlayUnidraw/ovcatalog.h>
class MapCatalog : public OverlayCatalog {
Index: MapUnidraw/mapcmds.c
diff -c MapUnidraw/mapcmds.c:1.1 MapUnidraw/mapcmds.c:1.2
*** MapUnidraw/mapcmds.c:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapcmds.c Fri May 17 13:46:41 2002
***************
*** 66,71 ****
--- 66,72 ----
#include <OS/math.h>
#ifdef HAVE_ACE
+ #include <signal.h>
#include <ace/SOCK_Connector.h>
#include <ace/Log_Msg.h>
#include <ace/Log_Record.h>
Index: MapUnidraw/mapcomps.h
diff -c MapUnidraw/mapcomps.h:1.1 MapUnidraw/mapcomps.h:1.2
*** MapUnidraw/mapcomps.h:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapcomps.h Fri May 17 13:46:41 2002
***************
*** 25,30 ****
--- 25,32 ----
#ifndef mapcomps_h
#define mapcomps_h
+ #include <iosfwd>
+
#include <OverlayUnidraw/ovcomps.h>
#include <FrameUnidraw/framecomps.h>
#include <Map/mapfeature.h>
Index: MapUnidraw/mapcreator.h
diff -c MapUnidraw/mapcreator.h:1.1 MapUnidraw/mapcreator.h:1.2
*** MapUnidraw/mapcreator.h:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapcreator.h Fri May 17 13:46:41 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef mapcreator_h
#define mapcreator_h
+ #include <iosfwd>
+
#include <FrameUnidraw/framecreator.h>
class MapCreator : public FrameCreator {
Index: MapUnidraw/mapdialogs.c
diff -c MapUnidraw/mapdialogs.c:1.1 MapUnidraw/mapdialogs.c:1.2
*** MapUnidraw/mapdialogs.c:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapdialogs.c Fri May 17 13:46:41 2002
***************
*** 36,41 ****
--- 36,42 ----
#include <InterViews/glue.h>
#include <InterViews/matcheditor.h>
#include <InterViews/sensor.h>
+ #include <OS/math.h>
#include <stdio.h>
#include <stdlib.h>
***************
*** 83,89 ****
}
Interactor* GeoPointDialog::Interior () {
! const int space = round(.5*ivcm);
VBox* titleblock = new VBox(
new HBox(_title, new HGlue),
--- 84,90 ----
}
Interactor* GeoPointDialog::Interior () {
! const int space = Math::round(.5*ivcm);
VBox* titleblock = new VBox(
new HBox(_title, new HGlue),
Index: MapUnidraw/mapeditor.c
diff -c MapUnidraw/mapeditor.c:1.1 MapUnidraw/mapeditor.c:1.2
*** MapUnidraw/mapeditor.c:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapeditor.c Fri May 17 13:46:41 2002
***************
*** 77,83 ****
#include <InterViews/tray.h>
#include <InterViews/window.h>
! #include <Dispatch/rpcstream.h>
#include <ComTerp/comterpserv.h>
--- 77,83 ----
#include <InterViews/tray.h>
#include <InterViews/window.h>
! // #include <Dispatch/rpcstream.h>
#include <ComTerp/comterpserv.h>
***************
*** 144,150 ****
Interactor* MapEditor::Interior () {
HBorder* hborder = new HBorder;
VBorder* vborder = new VBorder;
! int gap = round(.1*ivcm);
_tray->HBox(_tray, _viewer, _tray);
--- 144,150 ----
Interactor* MapEditor::Interior () {
HBorder* hborder = new HBorder;
VBorder* vborder = new VBorder;
! int gap = (int)round(.1*ivcm);
_tray->HBox(_tray, _viewer, _tray);
Index: MapUnidraw/mapeditor.h
diff -c MapUnidraw/mapeditor.h:1.1 MapUnidraw/mapeditor.h:1.2
*** MapUnidraw/mapeditor.h:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapeditor.h Fri May 17 13:46:41 2002
***************
*** 111,117 ****
MapFClassState* _fclassstate;
MapSelectionState* _selstate;
! friend MapKit;
};
#endif
--- 111,117 ----
MapFClassState* _fclassstate;
MapSelectionState* _selstate;
! friend class MapKit;
};
#endif
Index: MapUnidraw/mapexport.c
diff -c MapUnidraw/mapexport.c:1.1 MapUnidraw/mapexport.c:1.2
*** MapUnidraw/mapexport.c:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapexport.c Fri May 17 13:46:41 2002
***************
*** 55,60 ****
--- 55,63 ----
#include <stream.h>
#include <stdio.h>
#include <stdlib.h>
+ #if __GNUG__>=3
+ #include <fstream.h>
+ #endif
/*****************************************************************************/
Index: MapUnidraw/mapimport.c
diff -c MapUnidraw/mapimport.c:1.1 MapUnidraw/mapimport.c:1.2
*** MapUnidraw/mapimport.c:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapimport.c Fri May 17 13:46:41 2002
***************
*** 54,59 ****
--- 54,62 ----
#include <InterViews/window.h>
#include <ctype.h>
#include <iostream.h>
+ #if __GNUG__>=3
+ #include <fstream.h>
+ #endif
/*****************************************************************************/
***************
*** 253,259 ****
comp = (OverlayComp*)PPM_Image(pathname);
} else {
filebuf fbuf;
! fbuf.open(pathname, "r");
istream in(&fbuf);
char ch; while (isspace(ch = in.get())); in.putback(ch);
int len = 255;
--- 256,262 ----
comp = (OverlayComp*)PPM_Image(pathname);
} else {
filebuf fbuf;
! fbuf.open(pathname, input);
istream in(&fbuf);
char ch; while (isspace(ch = in.get())); in.putback(ch);
int len = 255;
Index: MapUnidraw/mapimport.h
diff -c MapUnidraw/mapimport.h:1.1 MapUnidraw/mapimport.h:1.2
*** MapUnidraw/mapimport.h:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapimport.h Fri May 17 13:46:41 2002
***************
*** 28,33 ****
--- 28,35 ----
#ifndef map_import_h
#define map_import_h
+ #include <iosfwd>
+
#include <OverlayUnidraw/ovimport.h>
class MapImportCmd : public OvImportCmd {
Index: MapUnidraw/mapkit.c
diff -c MapUnidraw/mapkit.c:1.1 MapUnidraw/mapkit.c:1.2
*** MapUnidraw/mapkit.c:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapkit.c Fri May 17 13:46:41 2002
***************
*** 122,127 ****
--- 122,129 ----
#include <IVGlyph/exportchooser.h>
#include <IVGlyph/importchooser.h>
+ #include <string.h>
+
/******************************************************************************/
static const int unit = 15;
Index: MapUnidraw/mapproj.c
diff -c MapUnidraw/mapproj.c:1.1 MapUnidraw/mapproj.c:1.2
*** MapUnidraw/mapproj.c:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapproj.c Fri May 17 13:46:41 2002
***************
*** 32,37 ****
--- 32,38 ----
#include <InterViews/session.h>
#include <InterViews/window.h>
#include <stdio.h>
+ #include <string.h>
struct pnode {
char* name;
Index: MapUnidraw/mapps.h
diff -c MapUnidraw/mapps.h:1.1 MapUnidraw/mapps.h:1.2
*** MapUnidraw/mapps.h:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapps.h Fri May 17 13:46:41 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef mapps_h
#define mapps_h
+ #include <iosfwd>
+
#include <OverlayUnidraw/ovpsview.h>
class MapFeatureComp;
Index: MapUnidraw/maproute.c
diff -c MapUnidraw/maproute.c:1.1 MapUnidraw/maproute.c:1.2
*** MapUnidraw/maproute.c:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/maproute.c Fri May 17 13:46:41 2002
***************
*** 149,155 ****
PSColor* col = catalog->FindColor("Red");
gs.SetColors(col, col);
! double* x, *y;
int n = feature->points(x, y);
Coord* ix = new Coord[n];
Coord* iy = new Coord[n];
--- 149,155 ----
PSColor* col = catalog->FindColor("Red");
gs.SetColors(col, col);
! const double* x, *y;
int n = feature->points(x, y);
Coord* ix = new Coord[n];
Coord* iy = new Coord[n];
***************
*** 176,182 ****
Graphic* gr = GetGraphic();
gr->SetTransformer(new Transformer(mapviewstate->deftrans()));
! double *x, *y;
int npts = element->points(x, y);
int* ix = new int[npts];
int* iy = new int[npts];
--- 176,182 ----
Graphic* gr = GetGraphic();
gr->SetTransformer(new Transformer(mapviewstate->deftrans()));
! const double *x, *y;
int npts = element->points(x, y);
int* ix = new int[npts];
int* iy = new int[npts];
***************
*** 206,212 ****
boolean MapRouteScript::Definition (ostream& out) {
MapRouteComp* comp = (MapRouteComp*)GetSubject();
! double* x, *y;
MapElement* element = (MapElement*)comp->feature();
int n = element->points(x, y);
out << "route(";
--- 206,212 ----
boolean MapRouteScript::Definition (ostream& out) {
MapRouteComp* comp = (MapRouteComp*)GetSubject();
! const double* x, *y;
MapElement* element = (MapElement*)comp->feature();
int n = element->points(x, y);
out << "route(";
***************
*** 219,225 ****
}
for (int j=i; j<i+linemax && j<n; j++) {
if (j!=i) out << ",";
! out.form( "%.6f,%.6f", x[j], y[j] );
}
}
Attributes(out);
--- 219,225 ----
}
for (int j=i; j<i+linemax && j<n; j++) {
if (j!=i) out << ",";
! out_form2( out, "%.6f,%.6f", x[j], y[j] );
}
}
Attributes(out);
Index: MapUnidraw/maproute.h
diff -c MapUnidraw/maproute.h:1.1 MapUnidraw/maproute.h:1.2
*** MapUnidraw/maproute.h:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/maproute.h Fri May 17 13:46:41 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef routecomps_h
#define routecomps_h
+ #include <iosfwd>
+
#include <MapUnidraw/mapviews.h>
#include <MapUnidraw/mapinspect.h>
#include <MapUnidraw/mapscripts.h>
Index: MapUnidraw/mapscripts.c
diff -c MapUnidraw/mapscripts.c:1.1 MapUnidraw/mapscripts.c:1.2
*** MapUnidraw/mapscripts.c:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapscripts.c Fri May 17 13:46:41 2002
***************
*** 594,600 ****
fstr="point(%.2f,%.2f";
} else
fstr="point(%.6f,%.6f";
! out.form(fstr, tx, ty);
} else
out << "ellipse(" << Math::round(point->xorigin()) << ","
<< Math::round(point->yorigin()) << "10,10";
--- 594,600 ----
fstr="point(%.2f,%.2f";
} else
fstr="point(%.6f,%.6f";
! out_form2(out, fstr, tx, ty);
} else
out << "ellipse(" << Math::round(point->xorigin()) << ","
<< Math::round(point->yorigin()) << "10,10";
***************
*** 621,627 ****
fstr="(%.2f,%.2f)";
} else
fstr="(%.6f,%.6f)";
! out.form(fstr, tx, ty);
}
else
out << "(" << Math::round(fx[i]) << "," << Math::round(fy[i]) << ")";
--- 621,627 ----
fstr="(%.2f,%.2f)";
} else
fstr="(%.6f,%.6f)";
! out_form2(out, fstr, tx, ty);
}
else
out << "(" << Math::round(fx[i]) << "," << Math::round(fy[i]) << ")";
***************
*** 650,656 ****
fstr="(%.2f,%.2f)";
} else
fstr="(%.6f,%.6f)";
! out.form(fstr, tx, ty);
}
else
out << "(" << Math::round(fx[i]) << "," << Math::round(fy[i]) << ")";
--- 650,656 ----
fstr="(%.2f,%.2f)";
} else
fstr="(%.6f,%.6f)";
! out_form2(out, fstr, tx, ty);
}
else
out << "(" << Math::round(fx[i]) << "," << Math::round(fy[i]) << ")";
***************
*** 670,676 ****
fstr="text(%.2f,%.2f";
} else
fstr="text(%.6f,%.6f";
! out.form(fstr, tx, ty);
out << ", \"" << text->text() << "\"";
}
break;
--- 670,676 ----
fstr="text(%.2f,%.2f";
} else
fstr="text(%.6f,%.6f";
! out_form2(out, fstr, tx, ty);
out << ", \"" << text->text() << "\"";
}
break;
***************
*** 687,693 ****
fstr="junction(%.2f,%.2f";
} else
fstr="junction(%.6f,%.6f";
! out.form(fstr, tx, ty);
}
else
out << "ellipse(" << Math::round(node->xorigin()) << ","
--- 687,693 ----
fstr="junction(%.2f,%.2f";
} else
fstr="junction(%.6f,%.6f";
! out_form2(out, fstr, tx, ty);
}
else
out << "ellipse(" << Math::round(node->xorigin()) << ","
***************
*** 908,918 ****
float px2 = data.u;
float py2 = data.v;
}
- out.form("\n :sw_e %.6f :sw_n %.6f :ne_e %.6f :ne_n %.6f",
#if 0
px1, py1, px2, py2); // project extent
#else
! x1, y1, x2, y2); // already projected extent
#endif
}
out << "\n :mapfc \"" << fclass->name() << "\"";
--- 908,919 ----
float px2 = data.u;
float py2 = data.v;
}
#if 0
+ out_form4(out, "\n :sw_e %.6f :sw_n %.6f :ne_e %.6f :ne_n %.6f",
px1, py1, px2, py2); // project extent
#else
! out_form4(out, "\n :sw_e %.6f :sw_n %.6f :ne_e %.6f :ne_n %.6f",
! x1, y1, x2, y2); // already projected extent
#endif
}
out << "\n :mapfc \"" << fclass->name() << "\"";
Index: MapUnidraw/mapscripts.h
diff -c MapUnidraw/mapscripts.h:1.1 MapUnidraw/mapscripts.h:1.2
*** MapUnidraw/mapscripts.h:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapscripts.h Fri May 17 13:46:41 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef mapscripts_h
#define mapscripts_h
+ #include <iosfwd>
+
#include <OverlayUnidraw/scriptview.h>
#include <FrameUnidraw/framescripts.h>
Index: MapUnidraw/mapstatecmds.c
diff -c MapUnidraw/mapstatecmds.c:1.1 MapUnidraw/mapstatecmds.c:1.2
*** MapUnidraw/mapstatecmds.c:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapstatecmds.c Fri May 17 13:46:41 2002
***************
*** 33,38 ****
--- 33,39 ----
#include <InterViews/session.h>
#include <InterViews/window.h>
#include <stdio.h>
+ #include <string.h>
ClassId MapLibCmd::GetClassId () { return MAPLIB_CMD; }
Index: MapUnidraw/mapviews.c
diff -c MapUnidraw/mapviews.c:1.1 MapUnidraw/mapviews.c:1.2
*** MapUnidraw/mapviews.c:1.1 Thu Dec 20 10:50:04 2001
--- src/MapUnidraw/mapviews.c Fri May 17 13:46:41 2002
***************
*** 62,67 ****
--- 62,69 ----
#include <Attribute/attrlist.h>
#include <Attribute/attrvalue.h>
+ #include <OS/math.h>
+
#include <iostream.h>
***************
*** 116,130 ****
data.v = fyf;
}
! ix[i] = round(data.u);
! iy[i] = round(data.v);
} else {
float fxf = fx[i];
float fyf = fy[i];
if (t && !t->identity())
t->Transform(fxf, fyf, fxf, fyf);
! ix[i] = round(fxf * scale);
! iy[i] = round(fyf * scale);
}
}
}
--- 118,132 ----
data.v = fyf;
}
! ix[i] = Math::round(data.u);
! iy[i] = Math::round(data.v);
} else {
float fxf = fx[i];
float fyf = fy[i];
if (t && !t->identity())
t->Transform(fxf, fyf, fxf, fyf);
! ix[i] = Math::round(fxf * scale);
! iy[i] = Math::round(fyf * scale);
}
}
}
***************
*** 209,216 ****
else
radius = (int)(4 * (1.0 / a00 * 0.5));
((SF_Ellipse*)gr)->SetOriginal(ix[0], iy[0],
! round(radius/mag),
! round(radius/mag));
IncurDamage(gr);
}
break;
--- 211,218 ----
else
radius = (int)(4 * (1.0 / a00 * 0.5));
((SF_Ellipse*)gr)->SetOriginal(ix[0], iy[0],
! Math::round(radius/mag),
! Math::round(radius/mag));
IncurDamage(gr);
}
break;
***************
*** 307,314 ****
else
radius = (int)(4 * (1.0 / a00 * 0.5));
((SF_Ellipse*)gr)->SetOriginal(ix[0], iy[0],
! round(radius/mag),
! round(radius/mag));
IncurDamage(gr);
}
break;
--- 309,316 ----
else
radius = (int)(4 * (1.0 / a00 * 0.5));
((SF_Ellipse*)gr)->SetOriginal(ix[0], iy[0],
! Math::round(radius/mag),
! Math::round(radius/mag));
IncurDamage(gr);
}
break;
Index: VpfUnidraw/Imakefile
diff -c VpfUnidraw/Imakefile:1.1 VpfUnidraw/Imakefile:1.2
*** VpfUnidraw/Imakefile:1.1 Thu Dec 20 10:50:08 2001
--- src/VpfUnidraw/Imakefile Fri May 17 13:46:42 2002
***************
*** 27,33 ****
Obj26(vpftilesel)
Obj26(vpfviewstate)
! #define Obj31(file) MakeObjectFromSrcFlags(file, -Uiv2_6_compatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj31(vpfcmds)
Obj31(vpfgaz)
--- 27,33 ----
Obj26(vpftilesel)
Obj26(vpfviewstate)
! #define Obj31(file) MakeObjectFromSrcFlags(file, -Div2_6_incompatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj31(vpfcmds)
Obj31(vpfgaz)
Index: VpfUnidraw/vpfcatalog.c
diff -c VpfUnidraw/vpfcatalog.c:1.1 VpfUnidraw/vpfcatalog.c:1.2
*** VpfUnidraw/vpfcatalog.c:1.1 Thu Dec 20 10:50:08 2001
--- src/VpfUnidraw/vpfcatalog.c Fri May 17 13:46:42 2002
***************
*** 33,38 ****
--- 33,41 ----
#include <stream.h>
#include <ctype.h>
+ #if __GNUG__>=3
+ #include <fstream.h>
+ #endif
/*****************************************************************************/
Index: VpfUnidraw/vpfcomps.h
diff -c VpfUnidraw/vpfcomps.h:1.1 VpfUnidraw/vpfcomps.h:1.2
*** VpfUnidraw/vpfcomps.h:1.1 Thu Dec 20 10:50:08 2001
--- src/VpfUnidraw/vpfcomps.h Fri May 17 13:46:42 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef vpfcomps_h
#define vpfcomps_h
+ #include <iosfwd>
+
#include <MapUnidraw/mapcomps.h>
#include <MapUnidraw/mapviews.h>
***************
*** 55,61 ****
int _ntiles;
OverlaysComp** _tcomps;
char* _tmpname;
! friend VpfFClassScript;
protected:
ParamList* GetParamList();
void GrowParamList(ParamList*);
--- 57,63 ----
int _ntiles;
OverlaysComp** _tcomps;
char* _tmpname;
! friend class VpfFClassScript;
protected:
ParamList* GetParamList();
void GrowParamList(ParamList*);
Index: VpfUnidraw/vpfcreator.h
diff -c VpfUnidraw/vpfcreator.h:1.1 VpfUnidraw/vpfcreator.h:1.2
*** VpfUnidraw/vpfcreator.h:1.1 Thu Dec 20 10:50:08 2001
--- src/VpfUnidraw/vpfcreator.h Fri May 17 13:46:43 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef vpfcreator_h
#define vpfcreator_h
+ #include <iosfwd>
+
#include <MapUnidraw/mapcreator.h>
class VpfCreator : public MapCreator {
Index: VpfUnidraw/vpfedtile.h
diff -c VpfUnidraw/vpfedtile.h:1.1 VpfUnidraw/vpfedtile.h:1.2
*** VpfUnidraw/vpfedtile.h:1.1 Thu Dec 20 10:50:08 2001
--- src/VpfUnidraw/vpfedtile.h Fri May 17 13:46:43 2002
***************
*** 48,54 ****
VpfFeature** _tiles;
int _ntiles;
! friend VpfTileKit;
};
#endif
--- 48,54 ----
VpfFeature** _tiles;
int _ntiles;
! friend class VpfTileKit;
};
#endif
Index: VpfUnidraw/vpfscripts.c
diff -c VpfUnidraw/vpfscripts.c:1.1 VpfUnidraw/vpfscripts.c:1.2
*** VpfUnidraw/vpfscripts.c:1.1 Thu Dec 20 10:50:08 2001
--- src/VpfUnidraw/vpfscripts.c Fri May 17 13:46:43 2002
***************
*** 594,603 ****
float px2 = data.u;
float py2 = data.v;
// }
- out.form("\n :sw_e %.4f :sw_n %.4f :ne_e %.4f :ne_n %.4f",
#if 1
px1, py1, px2, py2); // project extent
#else
x1, y1, x2, y2); // already projected extent
#endif
--- 594,604 ----
float px2 = data.u;
float py2 = data.v;
// }
#if 1
+ out_form4(out, "\n :sw_e %.4f :sw_n %.4f :ne_e %.4f :ne_n %.4f",
px1, py1, px2, py2); // project extent
#else
+ out_form4(out, "\n :sw_e %.4f :sw_n %.4f :ne_e %.4f :ne_n %.4f",
x1, y1, x2, y2); // already projected extent
#endif
Index: VpfUnidraw/vpfscripts.h
diff -c VpfUnidraw/vpfscripts.h:1.1 VpfUnidraw/vpfscripts.h:1.2
*** VpfUnidraw/vpfscripts.h:1.1 Thu Dec 20 10:50:08 2001
--- src/VpfUnidraw/vpfscripts.h Fri May 17 13:46:43 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef vpfscripts_h
#define vpfscripts_h
+ #include <iosfwd>
+
#include <MapUnidraw/mapscripts.h>
class VpfFClassComp;
Index: VpfUnidraw/vpfviewstate.c
diff -c VpfUnidraw/vpfviewstate.c:1.1 VpfUnidraw/vpfviewstate.c:1.2
*** VpfUnidraw/vpfviewstate.c:1.1 Thu Dec 20 10:50:08 2001
--- src/VpfUnidraw/vpfviewstate.c Fri May 17 13:46:43 2002
***************
*** 36,41 ****
--- 36,42 ----
#include <InterViews/transformer.h>
#include <limits.h>
+ #include <string.h>
/****************************************************************************/
***************
*** 101,108 ****
data.u = xmin * DEG_TO_RAD;
data.v = ymin * DEG_TO_RAD;
data = pj_fwd(data, p);
! int x = round(data.u);
! int y = round(data.v);
Transformer* trans = new Transformer(scale,
0.0,
0.0,
--- 102,109 ----
data.u = xmin * DEG_TO_RAD;
data.v = ymin * DEG_TO_RAD;
data = pj_fwd(data, p);
! int x = (int)round(data.u);
! int y = (int)round(data.v);
Transformer* trans = new Transformer(scale,
0.0,
0.0,
Index: vpfviewer/main.c
diff -c vpfviewer/main.c:1.1 vpfviewer/main.c:1.2
*** vpfviewer/main.c:1.1 Thu Dec 20 10:50:10 2001
--- src/vpfviewer/main.c Fri May 17 13:46:44 2002
***************
*** 39,44 ****
--- 39,45 ----
#include <InterViews/world.h>
#ifdef HAVE_ACE
+ #include <signal.h>
#include <ace/OS.h>
#endif
Index: DlgUnidraw/Imakefile
diff -c DlgUnidraw/Imakefile:1.1 DlgUnidraw/Imakefile:1.2
*** DlgUnidraw/Imakefile:1.1 Thu Dec 20 10:50:14 2001
--- src/DlgUnidraw/Imakefile Fri May 17 13:46:45 2002
***************
*** 25,31 ****
Obj26(dlgscripts)
Obj26(dlgviewstate)
! #define Obj31(file) MakeObjectFromSrcFlags(file, -Uiv2_6_compatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj31(dlgkit)
--- 25,31 ----
Obj26(dlgscripts)
Obj26(dlgviewstate)
! #define Obj31(file) MakeObjectFromSrcFlags(file, -Div2_6_incompatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj31(dlgkit)
Index: DlgUnidraw/dlgcatalog.c
diff -c DlgUnidraw/dlgcatalog.c:1.1 DlgUnidraw/dlgcatalog.c:1.2
*** DlgUnidraw/dlgcatalog.c:1.1 Thu Dec 20 10:50:14 2001
--- src/DlgUnidraw/dlgcatalog.c Fri May 17 13:46:45 2002
***************
*** 33,38 ****
--- 33,41 ----
#include <stream.h>
#include <ctype.h>
+ #if __GNUG__>=3
+ #include <fstream.h>
+ #endif
/*****************************************************************************/
Index: DlgUnidraw/dlgcomps.h
diff -c DlgUnidraw/dlgcomps.h:1.1 DlgUnidraw/dlgcomps.h:1.2
*** DlgUnidraw/dlgcomps.h:1.1 Thu Dec 20 10:50:14 2001
--- src/DlgUnidraw/dlgcomps.h Fri May 17 13:46:45 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef dlgcomps_h
#define dlgcomps_h
+ #include <iosfwd>
+
#include <MapUnidraw/mapcomps.h>
#include <MapUnidraw/mapviews.h>
Index: DlgUnidraw/dlgcreator.h
diff -c DlgUnidraw/dlgcreator.h:1.1 DlgUnidraw/dlgcreator.h:1.2
*** DlgUnidraw/dlgcreator.h:1.1 Thu Dec 20 10:50:14 2001
--- src/DlgUnidraw/dlgcreator.h Fri May 17 13:46:45 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef dlgcreator_h
#define dlgcreator_h
+ #include <iosfwd>
+
#include <MapUnidraw/mapcreator.h>
class DlgCreator : public MapCreator {
Index: DlgUnidraw/dlgeditor.h
diff -c DlgUnidraw/dlgeditor.h:1.1 DlgUnidraw/dlgeditor.h:1.2
*** DlgUnidraw/dlgeditor.h:1.1 Thu Dec 20 10:50:14 2001
--- src/DlgUnidraw/dlgeditor.h Fri May 17 13:46:45 2002
***************
*** 48,54 ****
protected:
virtual void InitMapComp();
! friend DlgKit;
};
#endif
--- 48,54 ----
protected:
virtual void InitMapComp();
! friend class DlgKit;
};
#endif
Index: DlgUnidraw/dlgscripts.h
diff -c DlgUnidraw/dlgscripts.h:1.1 DlgUnidraw/dlgscripts.h:1.2
*** DlgUnidraw/dlgscripts.h:1.1 Thu Dec 20 10:50:14 2001
--- src/DlgUnidraw/dlgscripts.h Fri May 17 13:46:45 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef dlgscripts_h
#define dlgscripts_h
+ #include <iosfwd>
+
#include <MapUnidraw/mapscripts.h>
class DlgFClassComp;
Index: UtmUnidraw/Imakefile
diff -c UtmUnidraw/Imakefile:1.1 UtmUnidraw/Imakefile:1.2
*** UtmUnidraw/Imakefile:1.1 Thu Dec 20 10:50:26 2001
--- src/UtmUnidraw/Imakefile Fri May 17 13:46:47 2002
***************
*** 20,30 ****
Obj26(utmcmds)
Obj26(utmeditor)
! #define Obj31(file) MakeObjectFromSrcFlags(file, -Uiv2_6_compatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj31(utmkit)
! #define Obj_ACE(file) MakeObjectFromSrcFlags(file, -D__ACE_INLINE__ -Uiv2_6_compatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj_ACE(utmfunc)
--- 20,30 ----
Obj26(utmcmds)
Obj26(utmeditor)
! #define Obj31(file) MakeObjectFromSrcFlags(file, -Div2_6_incompatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj31(utmkit)
! #define Obj_ACE(file) MakeObjectFromSrcFlags(file, -D__ACE_INLINE__ -Div2_6_incompatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj_ACE(utmfunc)
Index: ProjUnidraw/Imakefile
diff -c ProjUnidraw/Imakefile:1.1 ProjUnidraw/Imakefile:1.2
*** ProjUnidraw/Imakefile:1.1 Thu Dec 20 10:50:51 2001
--- src/ProjUnidraw/Imakefile Fri May 17 13:46:49 2002
***************
*** 20,26 ****
Obj26(projcmds)
Obj26(projeditor)
! #define Obj31(file) MakeObjectFromSrcFlags(file, -Uiv2_6_compatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj31(projkit)
--- 20,26 ----
Obj26(projcmds)
Obj26(projeditor)
! #define Obj31(file) MakeObjectFromSrcFlags(file, -Div2_6_incompatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj31(projkit)
Index: Vehicle/algebra3.h
diff -c Vehicle/algebra3.h:1.1 Vehicle/algebra3.h:1.2
*** Vehicle/algebra3.h:1.1 Thu Dec 20 10:50:57 2001
--- src/Vehicle/algebra3.h Fri May 17 13:46:50 2002
***************
*** 25,30 ****
--- 25,32 ----
#ifndef ALGEBRA3H
#define ALGEBRA3H
+ #include <iosfwd>
+
#include <stdlib.h>
#include <assert.h>
//#include <yvals.h>
***************
*** 132,138 ****
#ifdef ALGEBRA3IOSTREAMS
friend ostream& operator << (ostream& s, const vec2& v); // output to stream
friend istream& operator >> (istream& s, vec2& v); // input from strm.
! #endif ALGEBRA3IOSTREAMS
friend void swap(vec2& a, vec2& b); // swap v1 & v2
friend vec2 vec2min(const vec2& a, const vec2& b); // min(v1, v2)
--- 134,140 ----
#ifdef ALGEBRA3IOSTREAMS
friend ostream& operator << (ostream& s, const vec2& v); // output to stream
friend istream& operator >> (istream& s, vec2& v); // input from strm.
! #endif // ALGEBRA3IOSTREAMS
friend void swap(vec2& a, vec2& b); // swap v1 & v2
friend vec2 vec2min(const vec2& a, const vec2& b); // min(v1, v2)
Index: VhclServ/vhclcomps.h
diff -c VhclServ/vhclcomps.h:1.1 VhclServ/vhclcomps.h:1.2
*** VhclServ/vhclcomps.h:1.1 Thu Dec 20 10:51:01 2001
--- src/VhclServ/vhclcomps.h Fri May 17 13:46:52 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef vhclcomps_h
#define vhclcomps_h
+ #include <iosfwd>
+
#include <OverlayUnidraw/ovcomps.h>
#include <OverlayUnidraw/scriptview.h>
Index: VhclServ/vhclcreator.h
diff -c VhclServ/vhclcreator.h:1.1 VhclServ/vhclcreator.h:1.2
*** VhclServ/vhclcreator.h:1.1 Thu Dec 20 10:51:01 2001
--- src/VhclServ/vhclcreator.h Fri May 17 13:46:52 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef vhclcreator_h
#define vhclcreator_h
+ #include <iosfwd>
+
#include <OverlayUnidraw/ovcreator.h>
class VhclCreator : public OverlayCreator {
Index: VhclUnidraw/Imakefile
diff -c VhclUnidraw/Imakefile:1.1 VhclUnidraw/Imakefile:1.2
*** VhclUnidraw/Imakefile:1.1 Thu Dec 20 10:51:08 2001
--- src/VhclUnidraw/Imakefile Fri May 17 13:46:53 2002
***************
*** 20,32 ****
Obj26(vhcleditor)
Obj26(vhclmapcreator)
! #define Obj31(file) MakeObjectFromSrcFlags(file, -Uiv2_6_compatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj31(vhclabout)
Obj31(vhclkit)
Obj31(vhclstates)
! #define Obj_ACE(file) MakeObjectFromSrcFlags(file, -D__ACE_INLINE__ -Uiv2_6_compatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
IncludeDependencies()
--- 20,32 ----
Obj26(vhcleditor)
Obj26(vhclmapcreator)
! #define Obj31(file) MakeObjectFromSrcFlags(file, -Div2_6_incompatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
Obj31(vhclabout)
Obj31(vhclkit)
Obj31(vhclstates)
! #define Obj_ACE(file) MakeObjectFromSrcFlags(file, -D__ACE_INLINE__ -Div2_6_incompatible -I$(IVTOOLSSRC)/include $(TOP_CCINCLUDES))
IncludeDependencies()
Index: VhclUnidraw/vhclmapcreator.h
diff -c VhclUnidraw/vhclmapcreator.h:1.1 VhclUnidraw/vhclmapcreator.h:1.2
*** VhclUnidraw/vhclmapcreator.h:1.1 Thu Dec 20 10:51:08 2001
--- src/VhclUnidraw/vhclmapcreator.h Fri May 17 13:46:53 2002
***************
*** 24,29 ****
--- 24,31 ----
#ifndef vhclmapcreator_h
#define vhclmapcreator_h
+ #include <iosfwd>
+
#include <MapUnidraw/mapcreator.h>
class VhclMapCreator : public MapCreator {
Index: config_vhclmaps/local.def
diff -c config_vhclmaps/local.def:1.1 config_vhclmaps/local.def:1.2
*** config_vhclmaps/local.def:1.1 Thu Dec 20 10:51:22 2001
--- config/local.def Fri May 17 13:46:55 2002
***************
*** 278,281 ****
--- 278,284 ----
#undef UseInstalled
+ /* substitute C compiler for makedepend */
+ #define DependCmd CCDriver -M
+
XCOMM -------------------------------------------------------------------------
Index: config_vhclmaps/params.def
diff -c config_vhclmaps/params.def:1.1 config_vhclmaps/params.def:1.2
*** config_vhclmaps/params.def:1.1 Thu Dec 20 10:51:22 2001
--- config/params.def Fri May 17 13:46:55 2002
***************
*** 443,449 ****
#ifndef AceCCDefines
#ifdef AceDir
! #define AceCCDefines -DHAVE_ACE
#else
#define AceCCDefines /**/
#endif
--- 443,449 ----
#ifndef AceCCDefines
#ifdef AceDir
! #define AceCCDefines -DHAVE_ACE -DACE_MT_SAFE=0
#else
#define AceCCDefines /**/
#endif
Index: config_vhclmaps/rules.def
diff -c config_vhclmaps/rules.def:1.1 config_vhclmaps/rules.def:1.2
*** config_vhclmaps/rules.def:1.1 Thu Dec 20 10:51:22 2001
--- config/rules.def Fri May 17 13:46:55 2002
***************
*** 441,447 ****
#ifndef DependTarget
#define DependTarget() @@\
depend:: @@\
! gcc -M $(DEPEND_CCFLAGS) $(SRCS) >Makefile.depend
#endif
/*
--- 441,447 ----
#ifndef DependTarget
#define DependTarget() @@\
depend:: @@\
! $(DEPEND) $(DEPEND_CCFLAGS) $(SRCS) >Makefile.depend
#endif
/*
*** /dev/null Fri May 17 13:46:57 PDT 2002
--- patches/vhclmaps-020517-johnston-033
*************** patches/vhclmaps-020517-johnston-033
*** 0 ****
--- 1 ----
+ vhclmaps-020517-johnston-033
|
