fly/flightgear
1
0
Fork 0
Code Activity

MSVC++ portability changes by Bernie Bright:

Browse source 
Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
Simulator/Cockpit/hud.cxx: Added Standard headers
Simulator/Cockpit/panel.cxx: Redefinition of default parameter
Simulator/Flight/flight.cxx: Replaced cout with FG_LOG.  Deleted <stdio.h>
Simulator/Main/fg_init.cxx:
Simulator/Main/GLUTmain.cxx:
Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
Simulator/Objects/material.hxx:
Simulator/Time/timestamp.hxx: VC++ friend kludge
Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
Simulator/Main/views.hxx: Added a constant
This commit is contained in:
curt 1999-02-02 20:13:29 +00:00
parent 1209546e08
commit 91cb0e2a99
12 changed files with 265 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Astro/sky.cxx
View file

@ -300,7 +300,7 @@ void fgSkyRender( void ) {
xglBegin( GL_TRIANGLE_FAN ); xglBegin( GL_TRIANGLE_FAN );
xglColor4fv(l->sky_color); xglColor4fv(l->sky_color);
xglVertex3f(0.0, 0.0, CENTER_ELEV); xglVertex3f(0.0, 0.0, CENTER_ELEV);
for ( i = 11; i >= 0; i++ ) { for ( i = 11; i >= 0; i-- ) {
xglColor4fv( inner_color ); xglColor4fv( inner_color );
xglVertex3fv( inner_vertex[i] ); xglVertex3fv( inner_vertex[i] );
} }
@ -362,6 +362,22 @@ void fgSkyRender( void ) {
// $Log$ // $Log$
// Revision 1.20 1999/02/02 20:13:29 curt
// MSVC++ portability changes by Bernie Bright:
//
// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
// Simulator/Cockpit/hud.cxx: Added Standard headers
// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted <stdio.h>
// Simulator/Main/fg_init.cxx:
// Simulator/Main/GLUTmain.cxx:
// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
// Simulator/Objects/material.hxx:
// Simulator/Time/timestamp.hxx: VC++ friend kludge
// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
// Simulator/Main/views.hxx: Added a constant
//
// Revision 1.19 1999/02/01 21:33:26 curt // Revision 1.19 1999/02/01 21:33:26 curt
// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since // Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
// Jon accepted my offer to do this and thought it was a good idea. // Jon accepted my offer to do this and thought it was a good idea.

34
Astro/stars.cxx
View file

@ -31,12 +31,20 @@
# include <windows.h> # include <windows.h>
#endif #endif
#include "Include/compiler.h"
#ifdef FG_HAVE_STD_INCLUDES
# include <cmath>
# include <cstdio>
# include <cstring>
# include <ctime>
#else
# include <math.h>
# include <stdio.h>
# include <string.h>
# include <time.h>
#endif
#include <math.h>
#include <stdio.h>
#include <string.h>
#include <string> #include <string>
#include <time.h>
#include <GL/glut.h> #include <GL/glut.h>
#include <XGL/xgl.h> #include <XGL/xgl.h>
@ -49,9 +57,11 @@
#include <Main/views.hxx> #include <Main/views.hxx>
#include <Misc/stopwatch.hxx> #include <Misc/stopwatch.hxx>
#include <Time/fg_time.hxx> #include <Time/fg_time.hxx>
#include "Misc/stopwatch.hxx"
#include "stars.hxx" #include "stars.hxx"
FG_USING_STD(getline);
#define EpochStart (631065600) #define EpochStart (631065600)
#define DaysSinceEpoch(secs) (((secs)-EpochStart)*(1.0/(24*3600))) #define DaysSinceEpoch(secs) (((secs)-EpochStart)*(1.0/(24*3600)))
@ -254,6 +264,22 @@ void fgStarsRender( void ) {
// $Log$ // $Log$
// Revision 1.26 1999/02/02 20:13:30 curt
// MSVC++ portability changes by Bernie Bright:
//
// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
// Simulator/Cockpit/hud.cxx: Added Standard headers
// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted <stdio.h>
// Simulator/Main/fg_init.cxx:
// Simulator/Main/GLUTmain.cxx:
// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
// Simulator/Objects/material.hxx:
// Simulator/Time/timestamp.hxx: VC++ friend kludge
// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
// Simulator/Main/views.hxx: Added a constant
//
// Revision 1.25 1998/12/09 18:50:15 curt // Revision 1.25 1998/12/09 18:50:15 curt
// Converted "class fgVIEW" to "class FGView" and updated to make data // Converted "class fgVIEW" to "class FGView" and updated to make data
// members private and make required accessor functions. // members private and make required accessor functions.

30
Cockpit/hud.cxx
View file

@ -39,10 +39,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_VALUES_H
# include <values.h> // for MAXINT
#endif
#include <Aircraft/aircraft.hxx> #include <Aircraft/aircraft.hxx>
#include <Debug/logstream.hxx> #include <Debug/logstream.hxx>
#include <Include/fg_constants.h> #include <Include/fg_constants.h>
@ -69,7 +65,10 @@ static char units[5];
// They should eventually be member functions of the aircraft. // They should eventually be member functions of the aircraft.
// //
deque< instr_item * > HUD_deque; typedef deque< instr_item * > HudContainerType;
typedef HudContainerType::iterator HudIterator;
HudContainerType HUD_deque;
class locRECT { class locRECT {
public: public:
@ -534,7 +533,6 @@ int fgHUDInit( fgAIRCRAFT * /* current_aircraft */ )
int fgHUDInit2( fgAIRCRAFT * /* current_aircraft */ ) int fgHUDInit2( fgAIRCRAFT * /* current_aircraft */ )
{ {
instr_item *HIptr;
int index; int index;
FG_LOG( FG_COCKPIT, FG_INFO, "Initializing current aircraft HUD" ); FG_LOG( FG_COCKPIT, FG_INFO, "Initializing current aircraft HUD" );
@ -769,8 +767,8 @@ void fgUpdateHUD( void ) {
glLineWidth(1); glLineWidth(1);
deque < instr_item * > :: iterator current = HUD_deque.begin(); HudIterator current = HUD_deque.begin();
deque < instr_item * > :: iterator last = HUD_deque.end(); HudIterator last = HUD_deque.end();
for ( ; current != last; ++current ) { for ( ; current != last; ++current ) {
pHUDInstr = *current; pHUDInstr = *current;
@ -840,6 +838,22 @@ void fgUpdateHUD( void ) {
} }
// $Log$ // $Log$
// Revision 1.31 1999/02/02 20:13:31 curt
// MSVC++ portability changes by Bernie Bright:
//
// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
// Simulator/Cockpit/hud.cxx: Added Standard headers
// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted <stdio.h>
// Simulator/Main/fg_init.cxx:
// Simulator/Main/GLUTmain.cxx:
// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
// Simulator/Objects/material.hxx:
// Simulator/Time/timestamp.hxx: VC++ friend kludge
// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
// Simulator/Main/views.hxx: Added a constant
//
// Revision 1.30 1999/01/27 04:47:52 curt // Revision 1.30 1999/01/27 04:47:52 curt
// Make lower end of altitude = -500 so the altimeter is guaged below zero (such // Make lower end of altitude = -500 so the altimeter is guaged below zero (such
// as in death valley.) // as in death valley.)

42
Cockpit/panel.cxx
View file

@ -35,11 +35,21 @@
#include <GL/glut.h> #include <GL/glut.h>
#include <XGL/xgl.h> #include <XGL/xgl.h>
#include <stdlib.h> #include "Include/compiler.h"
#include <stdio.h> #ifdef FG_HAVE_STD_INCLUDES
#include <string.h> # include <cstdlib>
# include <cstdio>
# include <cstring>
# include <cmath>
#else
# include <stdlib.h>
# include <stdio.h>
# include <string.h>
# include <math.h>
#endif
#include <string> #include <string>
#include <math.h> FG_USING_STD(string);
#include <Aircraft/aircraft.hxx> #include <Aircraft/aircraft.hxx>
#include <Debug/logstream.hxx> #include <Debug/logstream.hxx>
@ -302,7 +312,7 @@ static IMAGE *ImageLoad(char *fileName)
exit(-1); exit(-1);
} }
ImageGetRawData(image, final->data); ImageGetRawData(image, (char*)final->data);
ImageClose(image); ImageClose(image);
return final; return final;
} }
@ -876,7 +886,10 @@ float UpdatePointer(Pointer pointer){
// fgEraseArea - 'Erases' a drawn Polygon by overlaying it with a textured // fgEraseArea - 'Erases' a drawn Polygon by overlaying it with a textured
// area. Shall be a method of a panel class once. // area. Shall be a method of a panel class once.
void fgEraseArea(GLfloat *array, int NumVerti, GLfloat texXPos, GLfloat texYPos, GLfloat XPos, GLfloat YPos, int Texid, float ScaleFactor = 1){ void fgEraseArea(GLfloat *array, int NumVerti, GLfloat texXPos,
GLfloat texYPos, GLfloat XPos, GLfloat YPos,
int Texid, float ScaleFactor)
{
int i, j; int i, j;
int n; int n;
float a; float a;
@ -1066,6 +1079,22 @@ printf(" %f %f %f %f \n", mvmatrix[12], mvmatrix[13], mvmatrix[14], mvma
} }
// $Log$ // $Log$
// Revision 1.14 1999/02/02 20:13:33 curt
// MSVC++ portability changes by Bernie Bright:
//
// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
// Simulator/Cockpit/hud.cxx: Added Standard headers
// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted <stdio.h>
// Simulator/Main/fg_init.cxx:
// Simulator/Main/GLUTmain.cxx:
// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
// Simulator/Objects/material.hxx:
// Simulator/Time/timestamp.hxx: VC++ friend kludge
// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
// Simulator/Main/views.hxx: Added a constant
//
// Revision 1.13 1999/01/07 19:25:53 curt // Revision 1.13 1999/01/07 19:25:53 curt
// Updates from Friedemann Reinhard. // Updates from Friedemann Reinhard.
// //
@ -1094,4 +1123,3 @@ printf(" %f %f %f %f \n", mvmatrix[12], mvmatrix[13], mvmatrix[14], mvma
// Incorporated Friedemann Reinhard's <mpt218@faupt212.physik.uni-erlangen.de> // Incorporated Friedemann Reinhard's <mpt218@faupt212.physik.uni-erlangen.de>
// first pass at an isntrument panel. // first pass at an isntrument panel.
// //

23
Main/GLUTmain.cxx
View file

@ -85,6 +85,7 @@
#include "options.hxx" #include "options.hxx"
#include "splash.hxx" #include "splash.hxx"
#include "views.hxx" #include "views.hxx"
#include "fg_serial.hxx"
// This is a record containing a bit of global housekeeping information // This is a record containing a bit of global housekeeping information
@ -739,7 +740,7 @@ static void fgIdleFunction ( void ) {
audio_sched = new slScheduler ( 8000 ); audio_sched = new slScheduler ( 8000 );
audio_mixer = new smMixer; audio_mixer = new smMixer;
audio_mixer -> setMasterVolume ( 50 ) ; /* 80% of max volume. */ audio_mixer -> setMasterVolume ( 80 ) ; /* 80% of max volume. */
audio_sched -> setSafetyMargin ( 1.0 ) ; audio_sched -> setSafetyMargin ( 1.0 ) ;
string slfile = current_options.get_fg_root() + "/Sounds/wasp.wav"; string slfile = current_options.get_fg_root() + "/Sounds/wasp.wav";
@ -968,8 +969,8 @@ int main( int argc, char **argv ) {
// Something must have gone horribly wrong with the command // Something must have gone horribly wrong with the command
// line parsing or maybe the user just requested help ... :-) // line parsing or maybe the user just requested help ... :-)
current_options.usage(); current_options.usage();
// FG_LOG( FG_GENERAL, FG_ALERT, "\nExiting ..."); FG_LOG( FG_GENERAL, FG_ALERT, "\nExiting ...");
cout << endl << "Exiting ..." << endl; // cout << endl << "Exiting ..." << endl;
exit(-1); exit(-1);
} }
@ -1006,6 +1007,22 @@ int main( int argc, char **argv ) {
// $Log$ // $Log$
// Revision 1.84 1999/02/02 20:13:34 curt
// MSVC++ portability changes by Bernie Bright:
//
// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
// Simulator/Cockpit/hud.cxx: Added Standard headers
// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted <stdio.h>
// Simulator/Main/fg_init.cxx:
// Simulator/Main/GLUTmain.cxx:
// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
// Simulator/Objects/material.hxx:
// Simulator/Time/timestamp.hxx: VC++ friend kludge
// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
// Simulator/Main/views.hxx: Added a constant
//
// Revision 1.83 1999/01/27 04:49:17 curt // Revision 1.83 1999/01/27 04:49:17 curt
// Game mode fixes from Norman Vine. // Game mode fixes from Norman Vine.
// Initial altitude setting tweaks and fixes (especially for when starting // Initial altitude setting tweaks and fixes (especially for when starting

17
Main/fg_init.cxx
View file

@ -65,6 +65,7 @@
#include "fg_init.hxx" #include "fg_init.hxx"
#include "options.hxx" #include "options.hxx"
#include "views.hxx" #include "views.hxx"
#include "fg_serial.hxx"
extern const char *default_root; extern const char *default_root;
@ -391,6 +392,22 @@ int fgInitSubsystems( void )
// $Log$ // $Log$
// Revision 1.65 1999/02/02 20:13:36 curt
// MSVC++ portability changes by Bernie Bright:
//
// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
// Simulator/Cockpit/hud.cxx: Added Standard headers
// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted <stdio.h>
// Simulator/Main/fg_init.cxx:
// Simulator/Main/GLUTmain.cxx:
// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
// Simulator/Objects/material.hxx:
// Simulator/Time/timestamp.hxx: VC++ friend kludge
// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
// Simulator/Main/views.hxx: Added a constant
//
// Revision 1.64 1999/02/01 21:15:43 curt // Revision 1.64 1999/02/01 21:15:43 curt
// Removed unused variables. // Removed unused variables.
// //

25
Main/options.hxx
View file

@ -47,11 +47,10 @@
FG_USING_STD(string); FG_USING_STD(string);
#include <vector> #include <vector>
#include "Include/fg_stl_config.h" #include "Include/compiler.h"
FG_USING_STD(vector);
FG_USING_NAMESPACE(std); FG_USING_STD(string);
// #include "fg_serial.hxx"
#include "fg_serial.hxx"
typedef vector < string > str_container; typedef vector < string > str_container;
@ -246,6 +245,22 @@ extern fgOPTIONS current_options;
// $Log$ // $Log$
// Revision 1.26 1999/02/02 20:13:37 curt
// MSVC++ portability changes by Bernie Bright:
//
// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
// Simulator/Cockpit/hud.cxx: Added Standard headers
// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted <stdio.h>
// Simulator/Main/fg_init.cxx:
// Simulator/Main/GLUTmain.cxx:
// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
// Simulator/Objects/material.hxx:
// Simulator/Time/timestamp.hxx: VC++ friend kludge
// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
// Simulator/Main/views.hxx: Added a constant
//
// Revision 1.25 1999/01/19 20:57:06 curt // Revision 1.25 1999/01/19 20:57:06 curt
// MacOS portability changes contributed by "Robert Puyol" <puyol@abvent.fr> // MacOS portability changes contributed by "Robert Puyol" <puyol@abvent.fr>
// //

20
Main/views.hxx
View file

@ -47,6 +47,8 @@
// Define a structure containing view information // Define a structure containing view information
class FGView { class FGView {
public:
// the current offset from forward for viewing // the current offset from forward for viewing
double view_offset; double view_offset;
@ -218,7 +220,7 @@ public:
inline double *get_surface_south() { return surface_south; } inline double *get_surface_south() { return surface_south; }
inline double *get_surface_east() { return surface_east; } inline double *get_surface_east() { return surface_east; }
inline double *get_local_up() { return local_up; } inline double *get_local_up() { return local_up; }
inline MAT3mat *get_WORLD_TO_EYE() const { return &WORLD_TO_EYE; } inline const MAT3mat *get_WORLD_TO_EYE() const { return &WORLD_TO_EYE; }
inline GLdouble *get_MODEL_VIEW() { return MODEL_VIEW; } inline GLdouble *get_MODEL_VIEW() { return MODEL_VIEW; }
}; };
@ -230,6 +232,22 @@ extern FGView current_view;
// $Log$ // $Log$
// Revision 1.20 1999/02/02 20:13:38 curt
// MSVC++ portability changes by Bernie Bright:
//
// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
// Simulator/Cockpit/hud.cxx: Added Standard headers
// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted <stdio.h>
// Simulator/Main/fg_init.cxx:
// Simulator/Main/GLUTmain.cxx:
// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
// Simulator/Objects/material.hxx:
// Simulator/Time/timestamp.hxx: VC++ friend kludge
// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
// Simulator/Main/views.hxx: Added a constant
//
// Revision 1.19 1999/02/01 21:33:36 curt // Revision 1.19 1999/02/01 21:33:36 curt
// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since // Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
// Jon accepted my offer to do this and thought it was a good idea. // Jon accepted my offer to do this and thought it was a good idea.

33
Objects/material.hxx
View file

@ -41,18 +41,15 @@
#include <GL/glut.h> #include <GL/glut.h>
#include <XGL/xgl.h> #include <XGL/xgl.h>
#if defined ( __sun__ )
extern "C" void *memmove(void *, const void *, size_t);
extern "C" void *memset(void *, int, size_t);
#endif
#include <string> // Standard C++ string library #include <string> // Standard C++ string library
#include <map> // STL associative "array" #include <map> // STL associative "array"
#include <vector> // STL "array" #include <vector> // STL "array"
#ifdef NEEDNAMESPACESTD #include "Include/compiler.h"
using namespace std; FG_USING_STD(string);
#endif FG_USING_STD(map);
FG_USING_STD(vector);
FG_USING_STD(less);
// forward decl. // forward decl.
class fgFRAGMENT; class fgFRAGMENT;
@ -66,6 +63,9 @@ typedef frag_list_type::const_iterator frag_list_const_iterator;
// #define FG_MAX_MATERIAL_FRAGS 800 // #define FG_MAX_MATERIAL_FRAGS 800
// MSVC++ 6.0 kuldge - Need forward declaration of friends.
class fgMATERIAL;
istream& operator >> ( istream& in, fgMATERIAL& m );
// Material property class // Material property class
class fgMATERIAL { class fgMATERIAL {
@ -117,7 +117,6 @@ public:
friend istream& operator >> ( istream& in, fgMATERIAL& m ); friend istream& operator >> ( istream& in, fgMATERIAL& m );
}; };
istream& operator >> ( istream& in, fgMATERIAL& m );
// Material management class // Material management class
class fgMATERIAL_MGR { class fgMATERIAL_MGR {
@ -170,6 +169,22 @@ extern fgMATERIAL_MGR material_mgr;
// $Log$ // $Log$
// Revision 1.6 1999/02/02 20:13:39 curt
// MSVC++ portability changes by Bernie Bright:
//
// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
// Simulator/Cockpit/hud.cxx: Added Standard headers
// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted <stdio.h>
// Simulator/Main/fg_init.cxx:
// Simulator/Main/GLUTmain.cxx:
// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
// Simulator/Objects/material.hxx:
// Simulator/Time/timestamp.hxx: VC++ friend kludge
// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
// Simulator/Main/views.hxx: Added a constant
//
// Revision 1.5 1998/10/12 23:49:18 curt // Revision 1.5 1998/10/12 23:49:18 curt
// Changes from NHV to make the code more dynamic with fewer hard coded limits. // Changes from NHV to make the code more dynamic with fewer hard coded limits.
// //

24
Scenery/tile.cxx
View file

@ -22,8 +22,12 @@
// (Log is kept at end of this file) // (Log is kept at end of this file)
// #include <Include/fg_constants.h> #include "Include/compiler.h"
// #include <Math/mat3.h> #include STL_FUNCTIONAL
#include STL_ALGORITHM
FG_USING_STD(for_each);
FG_USING_STD(mem_fun_ref);
#include <Debug/logstream.hxx> #include <Debug/logstream.hxx>
#include <Scenery/tile.hxx> #include <Scenery/tile.hxx>
#include "Bucket/bucketutils.hxx" #include "Bucket/bucketutils.hxx"
@ -61,6 +65,22 @@ fgTILE::release_fragments()
// $Log$ // $Log$
// Revision 1.14 1999/02/02 20:13:40 curt
// MSVC++ portability changes by Bernie Bright:
//
// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
// Simulator/Cockpit/hud.cxx: Added Standard headers
// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted <stdio.h>
// Simulator/Main/fg_init.cxx:
// Simulator/Main/GLUTmain.cxx:
// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
// Simulator/Objects/material.hxx:
// Simulator/Time/timestamp.hxx: VC++ friend kludge
// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
// Simulator/Main/views.hxx: Added a constant
//
// Revision 1.13 1998/11/09 23:40:46 curt // Revision 1.13 1998/11/09 23:40:46 curt
// Bernie Bright <bbright@c031.aone.net.au> writes: // Bernie Bright <bbright@c031.aone.net.au> writes:
// I've made some changes to the Scenery handling. Basically just tidy ups. // I've made some changes to the Scenery handling. Basically just tidy ups.

23
Scenery/tile.hxx
View file

@ -45,11 +45,8 @@
#include <string> #include <string>
#include "Include/compiler.h" #include "Include/compiler.h"
#include STL_FUNCTIONAL FG_USING_STD(string);
#include STL_ALGORITHM FG_USING_STD(vector);
FG_USING_NAMESPACE(std);
// FG_USING_STD(string);
// FG_USING_STD(vector);
#include <Bucket/bucketutils.h> #include <Bucket/bucketutils.h>
#include <Math/mat3.h> #include <Math/mat3.h>
@ -160,6 +157,22 @@ private:
// $Log$ // $Log$
// Revision 1.23 1999/02/02 20:13:41 curt
// MSVC++ portability changes by Bernie Bright:
//
// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
// Simulator/Cockpit/hud.cxx: Added Standard headers
// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted <stdio.h>
// Simulator/Main/fg_init.cxx:
// Simulator/Main/GLUTmain.cxx:
// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
// Simulator/Objects/material.hxx:
// Simulator/Time/timestamp.hxx: VC++ friend kludge
// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
// Simulator/Main/views.hxx: Added a constant
//
// Revision 1.22 1998/12/03 01:18:16 curt // Revision 1.22 1998/12/03 01:18:16 curt
// Converted fgFLIGHT to a class. // Converted fgFLIGHT to a class.
// Tweaks for Sun Portability. // Tweaks for Sun Portability.

20
Time/timestamp.hxx
View file

@ -66,6 +66,10 @@
# include <mmsystem.h> # include <mmsystem.h>
#endif #endif
// MSVC++ 6.0 kuldge - Need forward declaration of friends.
class FGTimeStamp;
FGTimeStamp operator + (const FGTimeStamp& t, const long& m);
long operator - (const FGTimeStamp& a, const FGTimeStamp& b);
class FGTimeStamp { class FGTimeStamp {
@ -163,6 +167,22 @@ inline long operator - (const FGTimeStamp& a, const FGTimeStamp& b)
// $Log$ // $Log$
// Revision 1.5 1999/02/02 20:13:43 curt
// MSVC++ portability changes by Bernie Bright:
//
// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
// Simulator/Cockpit/hud.cxx: Added Standard headers
// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted <stdio.h>
// Simulator/Main/fg_init.cxx:
// Simulator/Main/GLUTmain.cxx:
// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
// Simulator/Objects/material.hxx:
// Simulator/Time/timestamp.hxx: VC++ friend kludge
// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
// Simulator/Main/views.hxx: Added a constant
//
// Revision 1.4 1999/01/09 13:37:46 curt // Revision 1.4 1999/01/09 13:37:46 curt
// Convert fgTIMESTAMP to FGTimeStamp which holds usec instead of ms. // Convert fgTIMESTAMP to FGTimeStamp which holds usec instead of ms.
// //