Hi,
On Friday 16 June 2006 14:30, Joacim Persson wrote:
> >>From talking to others on IRC I understand the cvs version of simgear
> >> builds
>
> fine with gcc 4, but with gcc 3.3.6 I get these compile errors added below.
> Is there a simple workaround for this?
Given the error message, I could imagine a that the attached patch helps.
Can you please tell me if that patch helps?
... I tested with gcc-4.1.1 and gcc-3.2.3 which are both happy with the actual
code. Can you help me testing with gcc-3.3.6?
:-/
Greetings
Mathias
--
Mathias Fröhlich, email: [EMAIL PROTECTED]
Index: simgear/scene/material/mat.cxx
===================================================================
RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/scene/material/mat.cxx,v
retrieving revision 1.29
diff -u -r1.29 mat.cxx
--- simgear/scene/material/mat.cxx 11 Jun 2006 13:30:59 -0000 1.29
+++ simgear/scene/material/mat.cxx 16 Jun 2006 22:38:18 -0000
@@ -317,6 +317,15 @@
}
}
+SGMaterialGlyph* SGMaterial::get_glyph (const string& name) const
+{
+ map<string, SGSharedPtr<SGMaterialGlyph> >::const_iterator it;
+ it = glyphs.find(name);
+ if (it == glyphs.end())
+ return 0;
+
+ return it->second;
+}
////////////////////////////////////////////////////////////////////////
Index: simgear/scene/material/mat.hxx
===================================================================
RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/scene/material/mat.hxx,v
retrieving revision 1.23
diff -u -r1.23 mat.hxx
--- simgear/scene/material/mat.hxx 11 Jun 2006 13:30:59 -0000 1.23
+++ simgear/scene/material/mat.hxx 16 Jun 2006 22:38:18 -0000
@@ -207,10 +207,7 @@
/**
* Return pointer to glyph class, or 0 if it doesn't exist.
*/
- SGMaterialGlyph * get_glyph (const string& name) const {
- map<string, SGSharedPtr<SGMaterialGlyph> >::const_iterator it = glyphs.find(name);
- return it != glyphs.end() ? it->second : 0;
- }
+ SGMaterialGlyph * get_glyph (const string& name) const;
protected:
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
