summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-04-27 23:04:56 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-06-02 19:05:42 +0200
commite7495712f7c82eb8804f9fcb382786ac567ed8cf (patch)
tree5353d1b184bf42c12f2b9a085d481e3176635bad
parentd2ff841bb567440cc88bc0b79331b52d6a75e60f (diff)
downloadtdelibs-e7495712f7c82eb8804f9fcb382786ac567ed8cf.tar.gz
tdelibs-e7495712f7c82eb8804f9fcb382786ac567ed8cf.zip
GCC 4.7 fix needed to build tdebase.
This partially resolves bug report 958. Thanks to Francois Andriot. (cherry picked from commit 7d40df87401ad303bea05d77fa51c53918a78014)
-rw-r--r--dcop/dcoptypes.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/dcop/dcoptypes.h b/dcop/dcoptypes.h
index 5c9d13745..e81639baa 100644
--- a/dcop/dcoptypes.h
+++ b/dcop/dcoptypes.h
@@ -22,6 +22,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef DCOPTYPES_H
#define DCOPTYPES_H
+// generic template fallback for unknown types
+template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; }
+
#include <dcopref.h>
// standard c/c++ types
@@ -70,9 +73,6 @@ class TQVariant; inline const char* dcopTypeName( const TQVariant& ) { return "T
// And some KDE types
class KURL; inline const char* dcopTypeName( const KURL& ) { return "KURL"; }
-// generic template fallback for unknown types
-template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; }
-
// type initialization for standard c/c++ types
inline void dcopTypeInit(bool& b){b=false;}
inline void dcopTypeInit(char& c){c=0;}