[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Christian Ehrlicher]

SVN commit 902899 by chehrlic:

msvc warnings-- + compile++

 M  +1 -1      codegenerators/sql/mysqlwriter.h  
 M  +7 -0      codeimport/kdevcppparser/preprocesslexer.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/sql/mysqlwriter.h #902898:902899
@@ -56,7 +56,7 @@
     /**
      * Reimplement printAutoIncrements from Base Class for MySQL
      */
-    void printAutoIncrements(QTextStream& sql, const UMLEntityAttributeList entAttList);
+    virtual void printAutoIncrements(QTextStream& sql, UMLEntityAttributeList entAttList);
 
 };
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h #902898:902899
@@ -42,6 +42,13 @@
 using boost::spirit::rule;
 using boost::spirit::scanner;
 using boost::spirit::ext::skip_rule_parser;
+#ifdef Q_CC_MSVC
+// this template isn't available in boost/static_assert.hpp:50
+// but msvc needs it (boost 1.37.0)
+namespace boost {
+  template <> struct STATIC_ASSERTION_FAILURE<false> { enum { value = 0 }; };
+}
+#endif
 
 typedef boost::spirit::position_iterator<QChar const*> CharIterator;
 typedef rule<scanner<CharIterator> > SkipRule;