CVS Commit by andreas: weird spec workaround for gcc 3.4
require($_SERVER['DOCUMENT_ROOT']."/includes/top_config.php");
?>
CVS Commit by andreas: weird spec workaround for gcc 3.4
Log Message:
-----------
weird spec workaround for gcc 3.4
Modified Files:
--------------
pgadmin3/src/include:
dlgProperty.h (r1.38 -> r1.39)
Index: dlgProperty.h
===================================================================
RCS file: /projects/pgadmin3/src/include/dlgProperty.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -Lsrc/include/dlgProperty.h -Lsrc/include/dlgProperty.h -u -w -r1.38 -r1.39
--- src/include/dlgProperty.h
+++ src/include/dlgProperty.h
@@ -63,6 +63,15 @@
void AppendComment(wxString &sql, const wxString &objName, pgObject *obj);
void AppendQuoted(wxString &sql, const wxString &name);
+
+#if __GNUC__ >= 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+ // ANSI spec 11.5 is quite brain dead about pointers of protected members: In order to access
+ // them using the base class name, they can't be protected.
+ // apparently, only gcc 3.4 knows that; other compilers take protected as protected.
+public:
+
+#endif
+
void OnPageSelect(wxNotebookEvent& event);
void OnOK(wxCommandEvent &ev);
void OnApply(wxCommandEvent &ev);
@@ -70,6 +79,7 @@
void OnChangeOwner(wxCommandEvent &ev);
void OnChangeStc(wxStyledTextEvent& event);
+protected:
void AddUsers(wxComboBox *cb1, wxComboBox *cb2=0);
void FillCombobox(const wxString &query, wxComboBox *cb1, wxComboBox *cb2=0);
void PrepareTablespace(wxComboBox *cb, const wxChar *current=0);
Home |
Main Index |
Thread Index