Re: CVS Commit by andreas: gcc3.4 workaround

[Raphael Enrici <blacknoz(at)club-internet(dot)fr>]

Raphaël Enrici wrote:

> Dave Page wrote:
>
> > > -----Original Message-----
> > > From: pgadmin-hackers-owner(at)postgresql(dot)org 
> > > [mailto:pgadmin-hackers-owner(at)postgresql(dot)org] On Behalf Of 
> > > cvs(at)cvs(dot)pgadmin(dot)org
> > > Sent: 16 August 2004 15:43
> > > To: pgadmin-hackers(at)postgresql(dot)org
> > > Subject: [pgadmin-hackers] CVS Commit by andreas: gcc3.4 workaround
> > >
> > > Log Message:
> > > -----------
> > > gcc3.4 workaround
> > >
> > > Modified Files:
> > > --------------
> > >    pgadmin3/src/include:
> > >        dlgClasses.h (r1.6 -> r1.7)
> >
> > Is this the cause of:
>
>
> Yes I think so.
>
> Andreas, it seems you missed something with the patch or maybe I just 
> provided a bad one.
> What I see in dlgClasses.h is:
> #if __GNUC__ >= 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
> public:
>     void OnOK(wxCommandEvent& ev);
>     void OnCancel(wxCommandEvent& ev);
>     void OnClose(wxCloseEvent& event);
> protected:
> #endif
>
> IMHO It should be:
> #if __GNUC__ >= 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
> public:
>
> #endif
>     void OnOK(wxCommandEvent& ev);
>     void OnCancel(wxCommandEvent& ev);
>     void OnClose(wxCloseEvent& event);
> protected:


patch attached to reflect this.

Regards,
Raphael

*** ./src/include/dlgClasses.h.old	Wed Aug 18 00:04:51 2004
--- ./src/include/dlgClasses.h	Wed Aug 18 00:05:17 2004
***************
*** 114,124 ****
  
  #if __GNUC__ >= 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
  public:
      void OnOK(wxCommandEvent& ev);
      void OnCancel(wxCommandEvent& ev);
      void OnClose(wxCloseEvent& event);
  protected:
- #endif
  
      void OnEndProcess(wxProcessEvent& event);
      void OnPollProcess(wxTimerEvent& event);
--- 114,124 ----
  
  #if __GNUC__ >= 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
  public:
+ #endif
      void OnOK(wxCommandEvent& ev);
      void OnCancel(wxCommandEvent& ev);
      void OnClose(wxCloseEvent& event);
  protected:
  
      void OnEndProcess(wxProcessEvent& event);
      void OnPollProcess(wxTimerEvent& event);