[Uml-devel] branches/work/soc-umbrello

[Gopala Krishna A]

SVN commit 942483 by gopala:

Merged revisions 913652 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r913652 | chehrlic | 2009-01-19 22:26:00 +0530 (Mon, 19 Jan 2009) | 1 line
  
  this hack is no longer needed since r912902
........


 _M            . (directory)  
 M  +0 -7      umbrello/codeimport/kdevcppparser/preprocesslexer.h  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652
--- branches/work/soc-umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h #942482:942483
@@ -42,13 +42,6 @@
 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;