Обсуждение: Issue on compiling pgAdmin trunk

Hi,

I had an issue when I tried to compile pgAdmin today. I did a complete
svn update (I mean I first did rm -rf on my directory, then svn update,
then ./configure, then make). gcc is complaining about duplicate use of
DebuggerApiVersion :

../pgadmin/include/debugger/dbgPgConn.h:67: error: declaration of
'DebuggerApiVersion dbgPgConn::DebuggerApiVersion()'
../pgadmin/include/debugger/dbgPgConn.h:37: error: changes meaning of
'DebuggerApiVersion' from 'typedef enum DebuggerApiVersion
DebuggerApiVersion'

So I changed the Enum's name to DebuggerApiVersion_Enum and everything
compiles now. Nevertheless, I'm not sure I did right, even if it
compiles fine. So, here is my patch.

Comments are more than welcome :)


--
Guillaume.
<!-- http://abs.traduc.org/
     http://lfs.traduc.org/
     http://docs.postgresqlfr.org/ -->
Index: pgadmin/include/debugger/dbgPgConn.h
===================================================================
--- pgadmin/include/debugger/dbgPgConn.h    (révision 6504)
+++ pgadmin/include/debugger/dbgPgConn.h    (copie de travail)
@@ -34,7 +34,7 @@
 {
     DEBUGGER_V1_API = 1,
     DEBUGGER_V2_API
-} DebuggerApiVersion;
+} DebuggerApiVersion_Enum;

 class dbgPgParams
 {
@@ -64,7 +64,7 @@
     bool BackendMinimumVersion(int major, int minor);
     bool EdbMinimumVersion(int major, int minor);
     bool GetIsEdb();
-    DebuggerApiVersion DebuggerApiVersion();
+    DebuggerApiVersion_Enum DebuggerApiVersion();
     wxString GetVersionString();
     bool isConnected() const;               // Returns true if the connection attempt succeeded
     const wxString  getName() const;        // Returns human-friendly name for this connection
Index: pgadmin/debugger/dbgPgConn.cpp
===================================================================
--- pgadmin/debugger/dbgPgConn.cpp    (révision 6504)
+++ pgadmin/debugger/dbgPgConn.cpp    (copie de travail)
@@ -298,7 +298,7 @@
 }


-DebuggerApiVersion dbgPgConn::DebuggerApiVersion()
+DebuggerApiVersion_Enum dbgPgConn::DebuggerApiVersion()
 {
     // EDB < 8.3 uses the original API
     if (GetIsEdb() && !EdbMinimumVersion(8, 3))

Guillaume Lelarge wrote:
> Hi,
>
> I had an issue when I tried to compile pgAdmin today. I did a complete
> svn update (I mean I first did rm -rf on my directory, then svn update,
> then ./configure, then make). gcc is complaining about duplicate use of
> DebuggerApiVersion :
>
> ../pgadmin/include/debugger/dbgPgConn.h:67: error: declaration of
> 'DebuggerApiVersion dbgPgConn::DebuggerApiVersion()'
> ../pgadmin/include/debugger/dbgPgConn.h:37: error: changes meaning of
> 'DebuggerApiVersion' from 'typedef enum DebuggerApiVersion
> DebuggerApiVersion'
>
> So I changed the Enum's name to DebuggerApiVersion_Enum and everything
> compiles now. Nevertheless, I'm not sure I did right, even if it
> compiles fine. So, here is my patch.
>
> Comments are more than welcome :)

Yeah, I spotted that in the auto-build last night. The fix seems sound,
but I'm not keen on the name. Perhaps just DebuggerApiVersions (note the s)?

Anyhoo, please commit if you have a minute.

Thanks, Dave.

Dave Page a écrit :
> Guillaume Lelarge wrote:
>> Hi,
>>
>> I had an issue when I tried to compile pgAdmin today. I did a complete
>> svn update (I mean I first did rm -rf on my directory, then svn update,
>> then ./configure, then make). gcc is complaining about duplicate use of
>> DebuggerApiVersion :
>>
>> ../pgadmin/include/debugger/dbgPgConn.h:67: error: declaration of
>> 'DebuggerApiVersion dbgPgConn::DebuggerApiVersion()'
>> ../pgadmin/include/debugger/dbgPgConn.h:37: error: changes meaning of
>> 'DebuggerApiVersion' from 'typedef enum DebuggerApiVersion
>> DebuggerApiVersion'
>>
>> So I changed the Enum's name to DebuggerApiVersion_Enum and everything
>> compiles now. Nevertheless, I'm not sure I did right, even if it
>> compiles fine. So, here is my patch.
>>
>> Comments are more than welcome :)
>
> Yeah, I spotted that in the auto-build last night. The fix seems sound,
> but I'm not keen on the name. Perhaps just DebuggerApiVersions (note the
> s)?
>

You're right. DebuggerApiVersions is a much better name.

> Anyhoo, please commit if you have a minute.
>

Done.

Thanks.


--
Guillaume.
<!-- http://abs.traduc.org/
     http://lfs.traduc.org/
     http://docs.postgresqlfr.org/ -->