Merge from V5_1_main 14/05/2010

diff --git a/config_files/check_qt.m4 b/config_files/check_qt.m4
index 0f28aef7d9255db367155e1b234aecd3db2e682c..574d8b32f10008a4a1429130a6291a6e46370c46 100644 (file)
--- a/config_files/check_qt.m4
+++ b/config_files/check_qt.m4
@@ -1,4 +1,4 @@
-dnl  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 dnl
 dnl  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 dnl  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/scripts/hxx2salome b/scripts/hxx2salome
index 13c50bee0934c95bf25b4434c33cde56111a6d55..55052993ab145402cecfd649f33efa859c17f6ae 100755 (executable)
--- a/scripts/hxx2salome
+++ b/scripts/hxx2salome
@@ -165,7 +165,7 @@ generate_module_source()
 #
     echo -e "\n-> Extract public functions\n"
     # we get first rid of the c like comments (parse01), then of the excetion specification (sed filter), finnaly we extract public functions (parse1)
-    cat ${hxx_file} | awk -f ${gene_dir}/parse01.awk | sed 's/throw.*;/;/g' | awk -f ${gene_dir}/parse1.awk > ${CLASS_NAME}_public_functions
+    cat ${hxx_file} | awk -f ${gene_dir}/parse01.awk | sed 's/virtual //g' | sed 's/MEDMEM_EXPORT//g' | sed 's/throw.*;/;/g' | awk -f ${gene_dir}/parse1.awk > ${CLASS_NAME}_public_functions
     cat ${CLASS_NAME}_public_functions
     if [ ! -s ${CLASS_NAME}_public_functions ]
     then

diff --git a/scripts/runIDLparser b/scripts/runIDLparser
index 158bf8f45d086f21aaf1dfe98e079293b8ef1691..8071c731aae5a07fc3753bd6eed0efd49447bad9 100755 (executable)
--- a/scripts/runIDLparser
+++ b/scripts/runIDLparser
@@ -1,5 +1,5 @@
 #! /bin/sh
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

diff --git a/src/hxx2salome.cpp b/src/hxx2salome.cpp
index 1640666118b1c109fb8e38ab38a7a250eda18d2b..96cff4dacce3ad78ccd319f0bd4b612b62f5e25c 100644 (file)
--- a/src/hxx2salome.cpp
+++ b/src/hxx2salome.cpp
@@ -6,6 +6,8 @@
 #include <QtGui/QFileDialog>
 #include <QtGui/QMessageBox>
 
+#include <cstdlib>
+
 #include "hxx2salome.h"
 
 // VSR: uncomment for debug mode