Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disable gcc warning about class having private dtors and no friends (patch 1065318)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-12-12 11:55:37 +00:00
parent 70a7bd90f9
commit f8fbc92bdb
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/bakefiles/common.bkl
View File

@@ -388,6 +388,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
-wcd=657 <!-- define this function inside its class definition (could have improved code quality) --> -wcd=657 <!-- define this function inside its class definition (could have improved code quality) -->
-wcd=667 <!-- 'va_start' macro will not work without an argument before '...' --> -wcd=667 <!-- 'va_start' macro will not work without an argument before '...' -->
</cppflags-watcom> </cppflags-watcom>
<cppflags-mingw>
-Wno-ctor-dtor-privacy <!-- only defines a private destructor and has no friends -->
</cppflags-mingw>
</template> </template>
<!-- for both GUI and wxBase libs/samples: --> <!-- for both GUI and wxBase libs/samples: -->

5
configure.in
View File

@@ -5988,7 +5988,8 @@ INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \
dnl C/C++ compiler options used to compile wxWidgets dnl C/C++ compiler options used to compile wxWidgets
if test "$GXX" = yes ; then if test "$GXX" = yes ; then
dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror" dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
CXXWARNINGS="-Wall" CWARNINGS="-Wall"
CXXWARNINGS="$CWARNINGS -Wno-ctor-dtor-privacy"
dnl should enable this one day... dnl should enable this one day...
dnl CXXWARNINGS="-Wall -Werror" dnl CXXWARNINGS="-Wall -Werror"
fi fi
@@ -5997,7 +5998,7 @@ EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
dnl remove the extra white space from the cc/c++/ld options dnl remove the extra white space from the cc/c++/ld options
CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS` CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS`
CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS` CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CWARNINGS`
CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS` CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS`

6
src/common/zipstrm.cpp
View File

@@ -470,7 +470,6 @@ class wxZipMemory
{ {
public: public:
wxZipMemory() : m_data(NULL), m_size(0), m_capacity(0), m_ref(1) { } wxZipMemory() : m_data(NULL), m_size(0), m_capacity(0), m_ref(1) { }
~wxZipMemory() { delete m_data; }
wxZipMemory *AddRef() { m_ref++; return this; } wxZipMemory *AddRef() { m_ref++; return this; }
void Release() { if (--m_ref == 0) delete this; } void Release() { if (--m_ref == 0) delete this; }
@@ -482,6 +481,7 @@ public:
wxZipMemory *Unique(size_t size); wxZipMemory *Unique(size_t size);
private: private:
~wxZipMemory() { delete m_data; }
char *m_data; char *m_data;
size_t m_size; size_t m_size;
@@ -548,7 +548,6 @@ class wxZipWeakLinks
{ {
public: public:
wxZipWeakLinks() : m_ref(1) { } wxZipWeakLinks() : m_ref(1) { }
~wxZipWeakLinks() { wxASSERT(IsEmpty()); }
void Release(const wxZipInputStream* WXUNUSED(x)) void Release(const wxZipInputStream* WXUNUSED(x))
{ if (--m_ref == 0) delete this; } { if (--m_ref == 0) delete this; }
@@ -562,6 +561,7 @@ public:
bool IsEmpty() const { return m_entries.empty(); } bool IsEmpty() const { return m_entries.empty(); }
private: private:
~wxZipWeakLinks() { wxASSERT(IsEmpty()); }
int m_ref; int m_ref;
_wxOffsetZipEntryMap m_entries; _wxOffsetZipEntryMap m_entries;
@@ -1147,7 +1147,6 @@ class wxZipStreamLink
{ {
public: public:
wxZipStreamLink(wxZipOutputStream *stream) : m_ref(1), m_stream(stream) { } wxZipStreamLink(wxZipOutputStream *stream) : m_ref(1), m_stream(stream) { }
~wxZipStreamLink() { }
wxZipStreamLink *AddRef() { m_ref++; return this; } wxZipStreamLink *AddRef() { m_ref++; return this; }
wxZipOutputStream *GetOutputStream() const { return m_stream; } wxZipOutputStream *GetOutputStream() const { return m_stream; }
@@ -1158,6 +1157,7 @@ public:
{ m_stream = NULL; if (--m_ref == 0) delete this; } { m_stream = NULL; if (--m_ref == 0) delete this; }
private: private:
~wxZipStreamLink() { }
int m_ref; int m_ref;
wxZipOutputStream *m_stream; wxZipOutputStream *m_stream;