mirror of
https://github.com/taglib/taglib.git
synced 2025-06-04 01:28:21 -04:00
Less of The Big Ugly in the middle of the classes.
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@942880 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
parent
56e8766126
commit
fad967ae0b
@ -91,16 +91,8 @@ namespace TagLib {
|
||||
|
||||
class TAGLIB_EXPORT FileTypeResolver
|
||||
{
|
||||
#ifdef __GNUC__
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1)
|
||||
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
TAGLIB_IGNORE_MISSING_DESTRUCTOR
|
||||
public:
|
||||
// do not fix compiler warning about missing virtual destructor
|
||||
// since this would not be binary compatible
|
||||
// let Scott fix it whenever he thinks BIC changes can next be applied
|
||||
/*!
|
||||
* This method must be overridden to provide an additional file type
|
||||
* resolver. If the resolver is able to determine the file type it should
|
||||
|
@ -59,12 +59,7 @@ namespace TagLib {
|
||||
|
||||
class TAGLIB_EXPORT StringHandler
|
||||
{
|
||||
#ifdef __GNUC__
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1)
|
||||
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
TAGLIB_IGNORE_MISSING_DESTRUCTOR
|
||||
public:
|
||||
// BIC: Add virtual destructor.
|
||||
|
||||
|
@ -30,6 +30,12 @@
|
||||
#define TAGLIB_MINOR_VERSION 5
|
||||
#define TAGLIB_PATCH_VERSION 0
|
||||
|
||||
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1))
|
||||
#define TAGLIB_IGNORE_MISSING_DESTRUCTOR pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
||||
#else
|
||||
#define TAGLIB_IGNORE_MISSING_DESTRUCTOR
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
|
||||
//! A namespace for all TagLib related classes and functions
|
||||
|
Loading…
x
Reference in New Issue
Block a user