From: vsr <vsr@opencascade.com>
Date: Fri, 14 May 2010 15:56:56 +0000 (+0000)
Subject: Merge from V5_1_main 14/05/2010
X-Git-Tag: TRIPOLI_302~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=24c395d3a7912044375226d3c92711120d0c3fce;p=tools%2Fhxx2salome.git

Merge from V5_1_main 14/05/2010
---

diff --git a/config_files/check_qt.m4 b/config_files/check_qt.m4
index 0f28aef..574d8b3 100644
--- 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 13c50be..5505299 100755
--- 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 158bf8f..8071c73 100755
--- 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 1640666..96cff4d 100644
--- 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