[insight-vmi] r2010 committed - Fix compilation for GCC > 4.6

[insig...@googlecode.com]

Revision: 2010
Author: kit...@gmail.com
Date: Fri Jan 3 00:57:43 2014 UTC
Log: Fix compilation for GCC > 4.6
http://code.google.com/p/insight-vmi/source/detail?r=2010

Modified:
/trunk/libinsight/include/insight/compiler.h
/trunk/libinsight/include/insight/kernelsymbolsclass.h
/trunk/libinsight/kernelsymbolsclass.cpp

=======================================
--- /trunk/libinsight/include/insight/compiler.h Wed Feb 13 14:40:51 2013
UTC
+++ /trunk/libinsight/include/insight/compiler.h Fri Jan 3 00:57:43 2014
UTC
@@ -23,13 +23,13 @@
# define DECL_OVERRIDE Q_DECL_OVERRIDE
#else
# if defined(__GNUC__)
-# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 407
-# error "You are using GCC >= 4.7, this version is known to
break the build!"
+//# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 407
+//# error "You are using GCC >= 4.7, this version is known to
break the build!"
# if defined(__GXX_EXPERIMENTAL_CXX0X__)
/* C++0x features supported in GCC 4.7: */
# define DECL_OVERRIDE override
# endif
-# endif /* __GXX_EXPERIMENTAL_CXX0X__ */
+//# endif /* __GXX_EXPERIMENTAL_CXX0X__ */
# endif /* __GNUC__ */
#endif /* Q_DECL_OVERRIDE */

=======================================
--- /trunk/libinsight/include/insight/kernelsymbolsclass.h Mon Feb 4
12:22:35 2013 UTC
+++ /trunk/libinsight/include/insight/kernelsymbolsclass.h Fri Jan 3
00:57:43 2014 UTC
@@ -12,7 +12,7 @@
#include <QScriptable>
#include <QScriptValue>
#include <QMultiHash>
-#include "instance_def.h"
+#include "instance.h"

// Forward declaration
class InstanceClass;
=======================================
--- /trunk/libinsight/kernelsymbolsclass.cpp Fri Jan 3 00:57:32 2014 UTC
+++ /trunk/libinsight/kernelsymbolsclass.cpp Fri Jan 3 00:57:43 2014 UTC
@@ -16,7 +16,7 @@
#include <QRegExp>

KernelSymbolsClass::KernelSymbolsClass(const KernelSymbols *symbols,
- InstanceClass* instClass, QObject* parent)
+ InstanceClass* instClass, QObject* parent)
: QObject(parent), _instClass(instClass), _symbols(symbols)
{
assert(instClass != 0);