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

[Gopala Krishna A]

SVN commit 829801 by gopala:

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

........
  r829794 | habacker | 2008-07-09 12:21:37 +0530 (Wed, 09 Jul 2008) | 1 line
  
  limit win32 non compile problem to cpp import, which is the real cause of trouble
........


 _M            . (directory)  
 M  +32 -17    umbrello/CMakeLists.txt  
 M  +7 -0      umbrello/codeimport/classimport.cpp  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-814855,815154,815433,815906,815954,816854,816861,817524,817552,819993,820008,821827,823169,823983,824915,825421,828311,828369,828633,828663,828672,829236,829488,829667,829787
   + /trunk/KDE/kdesdk/umbrello:1-814855,815154,815433,815906,815954,816854,816861,817524,817552,819993,820008,821827,823169,823983,824915,825421,828311,828369,828633,828663,828672,829236,829488,829667,829787,829794
--- branches/work/soc-umbrello/umbrello/CMakeLists.txt #829800:829801
@@ -179,12 +179,9 @@
 	${CMAKE_CURRENT_SOURCE_DIR}/codegenwizard/codegenoptionspage.ui
 	${CMAKE_CURRENT_SOURCE_DIR}/codegenwizard/codegenstatuspage.ui
 )
-
-
 set(libcodeimport_SRCS
 	codeimport/adaimport.cpp
 	codeimport/classimport.cpp
-	codeimport/cppimport.cpp
 	codeimport/idlimport.cpp
 	codeimport/import_utils.cpp
 	codeimport/javaimport.cpp
@@ -193,21 +190,39 @@
 	codeimport/pythonimport.cpp
 )
 
-set(libkdevcppparser_SRCS
-	codeimport/kdevcppparser/ast.cpp
-	codeimport/kdevcppparser/driver.cpp
-	codeimport/kdevcppparser/errors.cpp
-	codeimport/kdevcppparser/lexer.cpp
-	codeimport/kdevcppparser/lookup.cpp
-	codeimport/kdevcppparser/parser.cpp
-	codeimport/kdevcppparser/preprocesslexer.cpp
-	codeimport/kdevcppparser/tree_parser.cpp
-	codeimport/kdevcppparser/urlutil.cpp
-	codeimport/kdevcppparser/ast_utils.cpp
-	codeimport/kdevcppparser/cpptree2uml.cpp
-)
+if (WIN32)
+    # Both MSVC and SunPRO CC have a problem with position.h; we try to put a
+    # QChar into a spirit iterator, which, after a bunch of futzing, ends up in
+    # the STL string_ref templates, which use
+    #
+    #     union {
+    #        size_type _C_size;    // Number of actual data values stored
+    #        _CharT    _C_dummy;   // force the alignment of the first char
+    #     } _C_size;               // named to work around an HP aCC 3.30 bug
+    #
+    # and you can't have a class which requires an initializer in a union.
+    #
+    add_definitions(-DDISABLE_CPP_IMPORT)
+    set(libkdevcppparser_SRCS)
+else (WIN32)
+    list(APPEND libcodeimport_SRCS
+        codeimport/cppimport.cpp
+    )
+    set(libkdevcppparser_SRCS
+    	codeimport/kdevcppparser/ast.cpp
+    	codeimport/kdevcppparser/driver.cpp
+    	codeimport/kdevcppparser/errors.cpp
+    	codeimport/kdevcppparser/lexer.cpp
+    	codeimport/kdevcppparser/lookup.cpp
+    	codeimport/kdevcppparser/parser.cpp
+    	codeimport/kdevcppparser/preprocesslexer.cpp
+    	codeimport/kdevcppparser/tree_parser.cpp
+    	codeimport/kdevcppparser/urlutil.cpp
+    	codeimport/kdevcppparser/ast_utils.cpp
+    	codeimport/kdevcppparser/cpptree2uml.cpp
+    )
+endif(WIN32)
 
-
 set(libclipboard_SRCS
 	clipboard/umldragdata.cpp
 	clipboard/umlclipboard.cpp
--- branches/work/soc-umbrello/umbrello/codeimport/classimport.cpp #829800:829801
@@ -24,7 +24,9 @@
 #include "javaimport.h"
 #include "adaimport.h"
 #include "pascalimport.h"
+#ifndef DISABLE_CPP_IMPORT
 #include "cppimport.h"
+#endif
 
 void ClassImport::importFiles(const QStringList &fileList)
 {
@@ -55,8 +57,13 @@
         classImporter = new AdaImport();
     else if (filename.endsWith(".pas"))
         classImporter = new PascalImport();
+#ifndef DISABLE_CPP_IMPORT
     else
         classImporter = new CppImport();  // the default.
+#else
+    else 
+        classImporter = 0;
+#endif        
     return classImporter;
 }