#5 more patches for gcc 3.1

closed-out-of-date
nobody
None
5
2003-11-11
2002-05-12
Anonymous
No

Here are some more patches which gcc 3.1 wants.
They mostly have to do with include files and
casts.

Discussion

  • Joseph Wang
    Joseph Wang
    2002-05-12

    Logged In: YES
    user_id=542188

    ===================================================================
    RCS file:
    /cvsroot/celestia/celestia/src/celengine/starbrowser.h,v
    retrieving revision 1.2
    diff -u -r1.2 starbrowser.h
    --- src/celengine/starbrowser.h 16 Jan 2002 01:57:18 -0000 1.2
    +++ src/celengine/starbrowser.h 12 May 2002 21:38:30 -0000
    @@ -15,6 +15,8 @@
    #include "star.h"
    #include "stardb.h"
    #include "simulation.h"
    +#include <vector>
    +using namespace std;

    class StarBrowser
    {
    Index: src/celestia/celestiacore.cpp
    ===================================================================
    RCS file:
    /cvsroot/celestia/celestia/src/celestia/celestiacore.cpp,v
    retrieving revision 1.49
    diff -u -r1.49 celestiacore.cpp
    --- src/celestia/celestiacore.cpp 8 May 2002 20:16:52 -0000 1.49
    +++ src/celestia/celestiacore.cpp 12 May 2002 21:38:33 -0000
    @@ -194,7 +194,7 @@
    sim->setFrame(fav.coordSys, sim->getSelection());
    }

    -void CelestiaCore::addFavorite(string name, string
    parentFolder, FavoritesList::const_iterator* iter)
    +void CelestiaCore::addFavorite(string name, string
    parentFolder, FavoritesList::iterator* iter)
    {
    FavoritesList::iterator pos;
    if(!iter)
    @@ -214,8 +214,8 @@
    favorites->insert(pos, fav);
    }

    -void CelestiaCore::addFavoriteFolder(string name,
    FavoritesList::const_iterator* iter)
    +void CelestiaCore::addFavoriteFolder(string name,
    FavoritesList::iterator* iter)
    {
    FavoritesList::iterator pos;
    if(!iter)
    @@ -1140,8 +1146,8 @@
    {
    double distFromSun =
    body.getHeliocentricPosition(t).distanceFromOrigin();
    float planetTemp = sun->getTemperature() *
    - (float) (pow(1 - body.getAlbedo(), 0.25) *
    - sqrt(sun->getRadius() / (2 *
    distFromSun)));
    + (float) (pow((float)(1 -
    body.getAlbedo()), (float) 0.25) *+
    sqrt((float)(sun->getRadius() / (2 * distFromSun))));
    overlay << setprecision(0);
    overlay << "Temperature: " << planetTemp <<
    " K\n";
    overlay << setprecision(3);
    Index: src/celestia/celestiacore.h
    ===================================================================
    RCS file:
    /cvsroot/celestia/celestia/src/celestia/celestiacore.h,v
    retrieving revision 1.17
    diff -u -r1.17 celestiacore.h
    --- src/celestia/celestiacore.h 2 Apr 2002 10:35:27 -0000 1.17
    +++ src/celestia/celestiacore.h 12 May 2002 21:38:33 -0000
    @@ -126,8 +126,8 @@
    void readFavoritesFile();
    void writeFavoritesFile();
    void activateFavorite(FavoritesEntry&);
    - void addFavorite(std::string, std::string,
    FavoritesList::const_iterator* iter=NULL);
    - void addFavoriteFolder(std::string,
    FavoritesList::const_iterator* iter=NULL);
    + void addFavorite(std::string, std::string,
    FavoritesList::iterator* iter=NULL);
    + void addFavoriteFolder(std::string,
    FavoritesList::iterator* iter=NULL);
    const FavoritesList* getFavorites();

    const DestinationList* getDestinations();
    Index: src/celestia/glutmain.cpp
    ===================================================================
    RCS file: /cvsroot/celestia/celestia/src/celestia/glutmain.cpp,v
    retrieving revision 1.11
    diff -u -r1.11 glutmain.cpp
    --- src/celestia/glutmain.cpp 2 Apr 2002 18:13:29 -0000 1.11
    +++ src/celestia/glutmain.cpp 12 May 2002 21:38:34 -0000
    @@ -32,6 +32,8 @@
    #include <celmath/mathlib.h>
    #include <celengine/astro.h>
    #include "celestiacore.h"
    +#include <iostream>
    +using namespace std;
    /* what are you supposed to be?
    #include "popt.h"
    */

     
  • Don Goyette
    Don Goyette
    2003-11-11

    • status: open --> closed-out-of-date