[Haiku-commits] r31200 - haiku/trunk/src/apps/debugger/gui/team_window

[Ingo Weinhold]

On 2009-06-23 at 14:12:10 [+0200], stippi at mail.berlios.de wrote:
> Author: stippi
> Date: 2009-06-23 14:12:08 +0200 (Tue, 23 Jun 2009)
> New Revision: 31200
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=31200&view=rev
> 
> Modified:
>    haiku/trunk/src/apps/debugger/gui/team_window/SourceView.cpp
> Log:
> Sorry for messing in this code, but I was a bit helpless how to fix the GCC2
> build in another way...
> 
> 
> Modified: haiku/trunk/src/apps/debugger/gui/team_window/SourceView.cpp
> ===================================================================
> --- haiku/trunk/src/apps/debugger/gui/team_window/SourceView.cpp    
> 2009-06-23 11:05:16 UTC (rev 31199)
> +++ haiku/trunk/src/apps/debugger/gui/team_window/SourceView.cpp    
> 2009-06-23 12:12:08 UTC (rev 31200)
> @@ -96,13 +96,22 @@
>                                      MarkerList& markers);
>              BreakpointMarker*    _BreakpointMarkerAtLine(uint32 line);
>  
> -    template<typename MarkerType>
> -    static    int                    _CompareMarkers(const MarkerType* a,
> -                                    const MarkerType* b);
> +// TODO: "public" to workaround a GCC2 problem:
> +public:

The better solution is to make the inner classes friends. At least that's 
what they should be automatically according to the standard.

> +    static    int                    _CompareMarkers(const Marker* a,
> +                                    const Marker* b);
> +    static    int                    _CompareBreakpointMarkers(
> +                                    const BreakpointMarker* a,
> +                                    const BreakpointMarker* b);
>  
>      template<typename MarkerType>
> +    static    int                    _CompareLineMarkerTemplate(const 
> uint32* line,
> +                                    const MarkerType* marker);

Not sure I understand what that is supposed to fix.

CU, Ingo