From: secher Date: Tue, 6 Jan 2004 09:32:57 +0000 (+0000) Subject: portage sur processeur alpha/osf X-Git-Tag: BSEC_br1_20040202~9 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=97da2186be02c678ccf81b7996f12c830000de47;p=modules%2Fkernel.git portage sur processeur alpha/osf --- diff --git a/Makefile.in b/Makefile.in index 52b547b1e..45efee2b0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -151,7 +151,11 @@ install-include: $(include_list) # install script in $(bindir) : install-bin: $(BIN_SCRIPT) $(INSTALL) -d $(bindir) - $(INSTALL_PROGRAM) $^ $(bindir) + for f in X $(BIN_SCRIPT); do \ + if test $$f != X; then \ + (cp -p ./bin/$$f $(bindir) || exit 1); \ + fi; \ + done uninstall: uninstall-idl diff --git a/configure.in.base b/configure.in.base index dc8699189..872de60ef 100644 --- a/configure.in.base +++ b/configure.in.base @@ -48,6 +48,10 @@ echo Build root directory : $ROOT_BUILDDIR echo echo +dnl Modification B. Secher portage sur osf +AC_PATH_PROG(SHELL,sh,,) +AC_SUBST(SHELL) + if test -z "$AR"; then AC_CHECK_PROGS(AR,ar xar,:,$PATH) fi @@ -86,7 +90,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the dnl full-path to the binary instead. case "$INSTALL" in *install-sh*) - INSTALL='\${top_srcdir}'/salome_adm/unix/config_files/install-sh + INSTALL="${ROOT_SRCDIR}/salome_adm/unix/config_files/install-sh -c" ;; esac @@ -100,8 +104,10 @@ cc_ok=no dnl inutil car libtool dnl AC_PROG_CC AC_PROG_CXX +AC_CXX_WARNINGS +AC_CXX_TEMPLATE_DEPTH AC_DEPEND_FLAG -# AC_CC_WARNINGS([ansi]) +#AC_CC_WARNINGS([ansi]) cc_ok=yes dnl Library libdl : @@ -110,6 +116,13 @@ AC_CHECK_LIB(dl,dlopen) dnl add library libm : AC_CHECK_LIB(m,ceil) +dnl +dnl Check if we use std iostream by default or if we must add +dnl a compiler directive for that +dnl + +AC_CXX_USE_STD_IOSTREAM + dnl dnl Well we use sstream which is not in gcc pre-2.95.3 dnl We must test if it exists. If not, add it in include ! @@ -117,6 +130,14 @@ dnl AC_CXX_HAVE_SSTREAM +dnl +dnl --------------------------------------------- +dnl testing linker +dnl --------------------------------------------- +dnl + +AC_LINKER_OPTIONS + dnl dnl --------------------------------------------- dnl testing MPICH @@ -285,6 +306,8 @@ echo echo Configure variables="cc_ok mpich_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok" + +AC_SUBST(pyqt_ok) for var in $variables do diff --git a/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 b/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 index 7c87413dd..5dd873fd2 100644 --- a/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 +++ b/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 @@ -35,17 +35,34 @@ ac_cv_depend_flag, echo "conftest.o: conftest.c" > conftest.verif echo "int main() { return 0; }" > conftest.c +dnl Evolution portage sur CCRT/osf system + case $host_os in + osf*) +dnl sur CCRT/osf pas d'equivalent de l'option -MG de gcc avec compilo natif +dnl on utilise donc gnu pour generer les dependances. + DEPCC=gcc + DEPCXX=g++ + DEPCXXFLAGS="-Wno-deprecated -funsigned-char" + DIFFFLAGS="-w" + ;; + *) + DEPCC=${CC-cc} + DEPCXX=${CXX-c++} + DEPCXXFLAGS="\${CXXFLAGS}" + DIFFFLAGS="-b -B" + ;; + esac C_DEPEND_FLAG= for ac_C_DEPEND_FLAG in -xM -MM -M ; do rm -f conftest.d conftest.err - ${CC-cc} ${ac_C_DEPEND_FLAG} -c conftest.c 1> conftest.d 2> conftest.err + ${DEPCC} ${ac_C_DEPEND_FLAG} -c conftest.c 1> conftest.d 2> conftest.err if test -f conftest.u ; then mv conftest.u conftest.d fi rm -f conftest - diff -b -B conftest.d conftest.verif > conftest + diff ${DIFFFLAGS} conftest.d conftest.verif > conftest if test ! -s conftest ; then C_DEPEND_FLAG=${ac_C_DEPEND_FLAG} break @@ -54,12 +71,12 @@ ac_cv_depend_flag, dnl use gcc option -MG : asume unknown file will be construct later rm -f conftest.d conftest.err - ${CC-cc} ${C_DEPEND_FLAG} -MG -c conftest.c 1> conftest.d 2> conftest.err + ${DEPCC} ${C_DEPEND_FLAG} -MG -c conftest.c 1> conftest.d 2> conftest.err if test -f conftest.u ; then mv conftest.u conftest.d fi rm -f conftest - diff -b -B conftest.d conftest.verif > conftest + diff ${DIFFFLAGS} conftest.d conftest.verif > conftest if test ! -s conftest ; then C_DEPEND_FLAG=${C_DEPEND_FLAG}" -MG" fi @@ -70,7 +87,7 @@ dnl use gcc option -MG : asume unknown file will be construct later exit fi - echo -n " C : " ${C_DEPEND_FLAG} + printf " C : ${DEPCC} ${C_DEPEND_FLAG}" AC_LANG_CPLUSPLUS echo "conftest.o: conftest.cxx" > conftest.verif @@ -80,13 +97,13 @@ dnl use gcc option -MG : asume unknown file will be construct later for ac_CXX_DEPEND_FLAG in -xM -MM -M ; do rm -f conftest.d conftest.err - ${CXX-c++} ${ac_CXX_DEPEND_FLAG} -c conftest.cxx 1> conftest.d 2> conftest.err + ${DEPCXX} ${ac_CXX_DEPEND_FLAG} -c conftest.cxx 1> conftest.d 2> conftest.err if test -f conftest.u ; then mv conftest.u conftest.d fi rm -f conftest - diff -b -B conftest.d conftest.verif > conftest + diff ${DIFFFLAGS} conftest.d conftest.verif > conftest if test ! -s conftest ; then CXX_DEPEND_FLAG=${ac_CXX_DEPEND_FLAG} break @@ -95,12 +112,12 @@ dnl use gcc option -MG : asume unknown file will be construct later dnl use g++ option -MG : asume unknown file will be construct later rm -f conftest.d conftest.err - ${CXX-c++} ${CXX_DEPEND_FLAG} -MG -c conftest.cxx 1> conftest.d 2> conftest.err + ${DEPCXX} ${CXX_DEPEND_FLAG} -MG -c conftest.cxx 1> conftest.d 2> conftest.err if test -f conftest.u ; then mv conftest.u conftest.d fi rm -f conftest - diff -b -B conftest.d conftest.verif > conftest + diff ${DIFFFLAGS} conftest.d conftest.verif > conftest if test ! -s conftest ; then CXX_DEPEND_FLAG=${CXX_DEPEND_FLAG}" -MG" fi @@ -112,9 +129,12 @@ dnl use g++ option -MG : asume unknown file will be construct later exit fi - echo -n " C++ : " ${CXX_DEPEND_FLAG} + printf " C++ : ${DEPCXX} ${CXX_DEPEND_FLAG}" AC_LANG_RESTORE + AC_SUBST(DEPCC) + AC_SUBST(DEPCXX) + AC_SUBST(DEPCXXFLAGS) AC_SUBST(C_DEPEND_FLAG) AC_SUBST(CXX_DEPEND_FLAG) ]) diff --git a/salome_adm/unix/config_files/ac_cxx_template_depth.m4 b/salome_adm/unix/config_files/ac_cxx_template_depth.m4 new file mode 100644 index 000000000..1753d6dc8 --- /dev/null +++ b/salome_adm/unix/config_files/ac_cxx_template_depth.m4 @@ -0,0 +1,46 @@ +dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +dnl +dnl +dnl +dnl @synopsis AC_CXX_WARNINGS +dnl +dnl Check warning flags for C++ compiler to control warning messages +dnl +dnl @author Bernard Secher (CEA) - 04/12/2003 +dnl +AC_DEFUN([AC_CXX_TEMPLATE_DEPTH],[ + AC_MSG_CHECKING(c++ compiler have template-depth flag) + cat > conftest.cxx < /dev/null 2>&1; then + CXXTMPDPTHFLAGS="${ac_CXX_TMPDPTH_FLAG}" + AC_MSG_RESULT(${ac_CXX_TMPDPTH_FLAG}) + fTMPDPTH_FLAG=yes + break + fi + done + if test $fTMPDPTH_FLAG = no; then + AC_MSG_RESULT(no) + fi + AC_SUBST(CXXTMPDPTHFLAGS) +]) diff --git a/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 b/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 new file mode 100644 index 000000000..88685ce56 --- /dev/null +++ b/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 @@ -0,0 +1,55 @@ +dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +dnl +dnl +dnl +dnl @synopsis AC_CXX_USE_STD_IOSTREAM +dnl +dnl If the C++ library use std iostream +dnl +dnl @author Bernard Secher (CEA) - 05/12/2003 +dnl +AC_DEFUN([AC_CXX_USE_STD_IOSTREAM], +[ + +AC_MSG_CHECKING(whether the compiler use std iostream) + +cat > conftest.cxx < +int main(int argc, char **argv) {std::cout << "Hello" << std::endl; return 0;} +EOF + +fUSE_STD_IOSTREAM=no +for ac_CXX_USE_STD_IOSTREAM in "" -D__USE_STD_IOSTREAM ; do + if $CXX ${ac_CXX_USE_STD_IOSTREAM} conftest.cxx > /dev/null 2>&1; then + CXXFLAGS="$CXXFLAGS ${ac_CXX_USE_STD_IOSTREAM}" + if test x${ac_CXX_USE_STD_IOSTREAM} = x; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(${ac_CXX_USE_STD_IOSTREAM}) + fi + fUSE_STD_IOSTREAM=yes + break + fi +done +if test $fUSE_STD_IOSTREAM = no; then + AC_MSG_RESULT(no) +fi + +]) diff --git a/salome_adm/unix/config_files/ac_cxx_warnings.m4 b/salome_adm/unix/config_files/ac_cxx_warnings.m4 new file mode 100644 index 000000000..f37689c73 --- /dev/null +++ b/salome_adm/unix/config_files/ac_cxx_warnings.m4 @@ -0,0 +1,59 @@ +dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +dnl +dnl +dnl +dnl @synopsis AC_CXX_WARNINGS +dnl +dnl Check warning flags for C++ compiler to control warning messages +dnl +dnl @author Bernard Secher (CEA) - 04/12/2003 +dnl +AC_DEFUN([AC_CXX_WARNINGS],[ + AC_MSG_CHECKING(c++ compiler have no-deprecated flag) + cat > conftest.cxx < /dev/null 2>&1; then + CXXFLAGS="$CXXFLAGS ${ac_CXX_NODEP_FLAG}" + AC_MSG_RESULT(${ac_CXX_NODEP_FLAG}) + fNODEP_FLAG=yes + break + fi + done + if test $fNODEP_FLAG = no; then + AC_MSG_RESULT(no) + fi +dnl + AC_MSG_CHECKING(c++ compiler have repository flag) + fREP_FLAG=no + for ac_CXX_REP_FLAG in "-ptr ${ROOT_BUILDDIR}/cxx_repository"; do + if $CXX ${ac_CXX_REP_FLAG} conftest.cxx > /dev/null 2>&1; then + CXXFLAGS="$CXXFLAGS ${ac_CXX_REP_FLAG}" + AC_MSG_RESULT(${ac_CXX_REP_FLAG}) + fREP_FLAG=yes + break + fi + done + if test $fREP_FLAG = no; then + AC_MSG_RESULT(no) + fi +]) diff --git a/salome_adm/unix/config_files/ac_linker_options.m4 b/salome_adm/unix/config_files/ac_linker_options.m4 new file mode 100644 index 000000000..32a5d8e14 --- /dev/null +++ b/salome_adm/unix/config_files/ac_linker_options.m4 @@ -0,0 +1,56 @@ +dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +dnl +dnl +dnl +dnl @synopsis AC_LINKER_OPTIONS +dnl +dnl Check warning flags for C++ compiler to control warning messages +dnl +dnl @author Bernard Secher (CEA) - 04/12/2003 +dnl +AC_DEFUN([AC_LINKER_OPTIONS],[ + AC_MSG_CHECKING(loader have export dynamic option) + cat > conftest.cxx < /dev/null 2>&1; then + LDEXPDYNFLAGS="${ac_LD_EXPDYN_FLAG}" + AC_MSG_RESULT(${ac_LD_EXPDYN_FLAG}) + fEXPDYN_FLAG=yes + break + fi + done + if test $fEXPDYN_FLAG = no; then + AC_MSG_RESULT(no) + fi + AC_SUBST(LDEXPDYNFLAGS) +dnl + case $host_os in + osf*) + STDLIB="-lcxxstd" + ;; + *) + STDLIB="-lstdc++" + ;; + esac + AC_SUBST(STDLIB) +]) diff --git a/salome_adm/unix/config_files/check_cas.m4 b/salome_adm/unix/config_files/check_cas.m4 index 7ad5b3c12..1188558f7 100644 --- a/salome_adm/unix/config_files/check_cas.m4 +++ b/salome_adm/unix/config_files/check_cas.m4 @@ -36,6 +36,7 @@ AC_SUBST(CAS_MODELER) AC_SUBST(CAS_OCAF) AC_SUBST(CAS_DATAEXCHANGE) AC_SUBST(CAS_LDFLAGS) +AC_SUBST(CAS_LDPATH) CAS_CPPFLAGS="" CAS_CXXFLAGS="" @@ -57,7 +58,7 @@ case $host_os in irix6.*) casdir=Linux ;; - osf4.*) + osf*) casdir=Linux ;; solaris2.*) @@ -68,41 +69,71 @@ case $host_os in ;; esac +AC_MSG_CHECKING(for OpenCascade directories) +if test -d ${CASROOT}/${casdir}/lib; then + CAS_LDPATH="-L$CASROOT/$casdir/lib " + AC_MSG_RESULT(yes) +else + if test -d ${CASROOT}/lib; then + CAS_LDPATH="-L$CASROOT/lib " + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi +fi + + dnl were is OCC ? if test -z $CASROOT; then AC_MSG_WARN(You must provide CASROOT variable : see OCC installation manual) else occ_ok=yes + OCC_VERSION_MAJOR=0 + ff=$CASROOT/inc/Standard_Version.hxx + if test -f $ff ; then + grep "define OCC_VERSION_MAJOR" $ff > /dev/null + if test $? = 0 ; then + OCC_VERSION_MAJOR=`grep "define OCC_VERSION_MAJOR" $ff | awk '{i=3 ; print $i}'` + fi + fi fi if test "x$occ_ok" = "xyes"; then +dnl test c++ compiler flag for unsigned character + AC_MSG_CHECKING(c++ compiler have unsigned character flag) + cat > conftest.cxx < /dev/null 2>&1; then + CXXFLAGS="$CXXFLAGS ${ac_CXX_UCHAR_FLAG}" + AC_MSG_RESULT(${ac_CXX_UCHAR_FLAG}) + fUCHAR_FLAG=yes + break + fi + done + if test $fUCHAR_FLAG = no; then + AC_MSG_RESULT(no) + fi + dnl cascade headers CPPFLAGS_old="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -I$CASROOT/inc -Wno-deprecated" - CXXFLAGS_old="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -funsigned-char" + CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -I$CASROOT/inc" + CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS" AC_CHECK_HEADER(Standard_Type.hxx,occ_ok=yes ,occ_ok=no) - CPPFLAGS="$CPPFLAGS_old" - CXXFLAGS="$CXXFLAGS_old" fi if test "x$occ_ok" = xyes ; then - CAS_CPPFLAGS="-DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -I$CASROOT/inc" - CAS_CXXFLAGS="-funsigned-char" - AC_MSG_CHECKING(for OpenCascade libraries) - CPPFLAGS_old="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS -Wno-deprecated" - CXXFLAGS_old="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $CAS_CXXFLAGS" LIBS_old="$LIBS" - LIBS="$LIBS -L$CASROOT/$casdir/lib -lTKernel" + LIBS="$LIBS $CAS_LDPATH -lTKernel" AC_CACHE_VAL(salome_cv_lib_occ,[ AC_TRY_LINK( @@ -115,25 +146,35 @@ if test "x$occ_ok" = xyes ; then ]) occ_ok="$salome_cv_lib_occ" - CPPFLAGS="$CPPFLAGS_old" - CXXFLAGS="$CXXFLAGS_old" - LIBS="$LIBS_old" fi +CPPFLAGS="$CPPFLAGS_old" +LIBS="$LIBS_old" if test "x$occ_ok" = xno ; then AC_MSG_RESULT(no) AC_MSG_WARN(Opencascade libraries not found) else AC_MSG_RESULT(yes) - CAS_KERNEL="-L$CASROOT/$casdir/lib -lTKernel -lTKMath" - CAS_OCAF="-L$CASROOT/$casdir/lib -lPTKernel -lTKCAF -lFWOSPlugin -lTKPShape -lTKPCAF -lTKStdSchema -lTKShapeSchema -lPAppStdPlugin -lTKPAppStd -lTKCDF" -dnl CAS_VIEWER="-L$CASROOT/$casdir/lib -lTKOpenGl -lTKV3d -lTKV2d -lTKService" - CAS_VIEWER="-L$CASROOT/$casdir/lib -lTKOpenGl -lTKV3d -lTKService" -# CAS_MODELER="-L$CASROOT/$casdir/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBool -lTKHLR -lTKFillet -lTKFeat -lTKOffset" - CAS_MODELER="-L$CASROOT/$casdir/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBool -lTKHLR -lTKFillet -lTKOffset" -dnl CAS_DATAEXCHANGE="-L$CASROOT/$casdir/lib -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing -lTKShHealingStd -lTKSTL -lTKVRML " - CAS_DATAEXCHANGE="-L$CASROOT/$casdir/lib -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing -lTKShHealingStd" - CAS_LDFLAGS="$CAS_KERNEL $CAS_OCAF $CAS_VIEWER $CAS_MODELER $CAS_DATAEXCHANGE" + CAS_KERNEL="$CAS_LDPATH -lTKernel -lTKMath" + + # E.A. compatibility version 4 and 5.x + CAS_OCAF="$CAS_LDPATH -lPTKernel -lTKCAF -lFWOSPlugin -lTKPShape -lTKPCAF -lTKStdSchema -lTKShapeSchema -lPAppStdPlugin" + if test $OCC_VERSION_MAJOR < 5 ; then + CAS_OCAF="$CAS_OCAF -lTKPAppStd" + fi + CAS_OCAF="$CAS_OCAF -lTKCDF" + + CAS_VIEWER="$CAS_LDPATH -lTKOpenGl -lTKV3d -lTKService" + CAS_MODELER="$CAS_LDPATH -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBool -lTKHLR -lTKFillet -lTKOffset" + + # E.A. compatibility version 4 and 5.x + CAS_DATAEXCHANGE="$CAS_LDPATH -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing" + if test $OCC_VERSION_MAJOR < 5 ; then + CAS_DATAEXCHANGE="$CAS_DATAEXCHANGE -lTKShHealingStd" + fi + + + CAS_LDFLAGS="$CAS_KERNEL $CAS_OCAF $CAS_VIEWER $CAS_MODELER $CAS_DATAEXCHANGE" fi diff --git a/salome_adm/unix/config_files/check_htmlgen.m4 b/salome_adm/unix/config_files/check_htmlgen.m4 index 026f80d07..cb65ed3d0 100644 --- a/salome_adm/unix/config_files/check_htmlgen.m4 +++ b/salome_adm/unix/config_files/check_htmlgen.m4 @@ -14,11 +14,7 @@ AC_PATH_PROG(DOXYGEN,doxygen) if test "x$DOXYGEN" = "x" then doxygen_ok=no - AC_MSG_RESULT(no) AC_MSG_WARN(doxygen not found) -else - dnl AC_SUBST(DOXYGEN) - AC_MSG_RESULT(yes) fi AC_CHECKING(for graphviz) @@ -31,10 +27,7 @@ AC_PATH_PROG(DOT,dot) if test "x$DOT" = "x" ; then graphviz_ok=no - AC_MSG_RESULT(no) AC_MSG_WARN(graphviz not found) -else - AC_MSG_RESULT(yes) fi ])dnl diff --git a/salome_adm/unix/config_files/check_pthreads.m4 b/salome_adm/unix/config_files/check_pthreads.m4 index 0608c4a40..895ede57d 100644 --- a/salome_adm/unix/config_files/check_pthreads.m4 +++ b/salome_adm/unix/config_files/check_pthreads.m4 @@ -30,22 +30,33 @@ dnl@id $Id$ dnl ---------------------------------------------------------------- dnl CHECK_PTHREADS AC_DEFUN(CHECK_PTHREADS,[ -AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl -AC_CHECK_HEADER(pthread.h,AC_DEFINE(HAVE_PTHREAD_H)) -AC_CHECK_LIB(posix4,nanosleep, LIBS_PTHREADS="-lposix4",LIBS_PTHREADS="") -AC_CHECK_LIB(pthread,pthread_mutex_lock, - LIBS_PTHREADS="-lpthread $LIBS_PTHREADS") -AC_MSG_CHECKING([parameters for using pthreads]) -case $build_os in - freebsd*) - CFLAGS_PTHREADS="-pthread" - CXXFLAGS_PTHREADS="-pthread" - ;; - *) - ;; -esac -AC_MSG_RESULT(["flags: $CFLAGS_PTHREADS\;libs: $LIBS_PTHREADS"]) -threads_ok=yes +AC_MSG_CHECKING(flags for using pthreads) +cat > conftest.cxx < /dev/null 2>&1; then + CPPFLAGS="$CPPFLAGS ${ac_CXX_PTH_FLAG}" + fPTH_FLAG=yes + AC_MSG_RESULT($ac_CXX_PTH_FLAG) + break + fi +done + +if test $fPTH_FLAG = no; then + AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl + AC_CHECK_HEADER(pthread.h,AC_DEFINE(HAVE_PTHREAD_H)) + AC_CHECK_LIB(posix4,nanosleep, LIBS_PTHREADS="-lposix4",LIBS_PTHREADS="") + AC_CHECK_LIB(pthread,pthread_mutex_lock, + LIBS_PTHREADS="-lpthread $LIBS_PTHREADS",LIBS_PTHREADS="") +fi + +if test $fPTH_FLAG = no && x$LIBS_PTHREADS = x; then + threads_ok=no +else + threads_ok=yes +fi ])dnl dnl dnl diff --git a/salome_adm/unix/config_files/check_pyqt.m4 b/salome_adm/unix/config_files/check_pyqt.m4 index 09d4e426c..eb11bf251 100644 --- a/salome_adm/unix/config_files/check_pyqt.m4 +++ b/salome_adm/unix/config_files/check_pyqt.m4 @@ -22,7 +22,6 @@ if test "x$pyqt_ok" = xyes ; then AC_SUBST(PYQT_INCLUDES) AC_SUBST(PYQT_LIBS) AC_SUBST(PYQT_SIPS) - AC_MSG_RESULT(yes) else pyqt_ok=yes @@ -74,12 +73,10 @@ fi AC_CHECK_FILES("$PYQTDIR/qt.py","$PYQTDIR/qt/qt.py",pyqt_ok=yes,pyqt_ok=no) if test "x$pyqt_ok" = xno ; then - AC_MSG_RESULT(no) AC_MSG_WARN(pyqt not found) else AC_CHECK_FILE("$PYQTDIR/libqtcmodule.so",pyqt_ok=yes,pyqt_ok=no) if test "x$pyqt_ok" = xno ; then - AC_MSG_RESULT(no) AC_MSG_WARN(pyqt not found) else PYQT_ROOT=$PYQTDIR @@ -87,7 +84,6 @@ else fi AC_CHECK_FILE("$PYQT_SIPS/copying.sip",pyqt_ok=yes,pyqt_ok=no) if test "x$pyqt_ok" = xno ; then - AC_MSG_RESULT(no) AC_MSG_WARN(pyqt not found) else PYQT_INCLUDES="-I$PYQT_SIPS" @@ -97,7 +93,6 @@ else AC_SUBST(PYQT_INCLUDES) AC_SUBST(PYQT_LIBS) - AC_MSG_RESULT(yes) fi PYQT_ROOT=$PYQTDIR @@ -110,10 +105,6 @@ AC_SUBST(PYUIC) AC_SUBST(PYQT_SIPS) AC_SUBST(PYQT_LIBS) - - -AC_MSG_RESULT(for pyqt: $pyqt_ok) - fi ])dnl dnl diff --git a/salome_adm/unix/config_files/check_qt.m4 b/salome_adm/unix/config_files/check_qt.m4 index 753521cf9..55d70ebdd 100644 --- a/salome_adm/unix/config_files/check_qt.m4 +++ b/salome_adm/unix/config_files/check_qt.m4 @@ -80,7 +80,6 @@ QT_ROOT=$QTDIR if test "x$qt_ok" = "xyes" then - AC_MSG_CHECKING(include of qt headers) CPPFLAGS_old=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$QTDIR/include" @@ -92,11 +91,10 @@ then if test "x$qt_ok" = "xno" then - AC_MSG_RESULT(qt headers not found, or too old qt version, in $QTDIR/include) - AC_MSG_RESULT(QTDIR environment variable may be wrong) + AC_MSG_WARN(qt headers not found, or too old qt version, in $QTDIR/include) + AC_MSG_WARN(QTDIR environment variable may be wrong) else - AC_MSG_RESULT(yes) - QT_INCLUDES="-I${QT_ROOT}/include -DQT_THREAD_SUPPORT" + QT_INCLUDES="-I${QT_ROOT}/include -DQT_THREAD_SUPPORT" QT_MT_INCLUDES="-I${QT_ROOT}/include -DQT_THREAD_SUPPORT" fi fi diff --git a/salome_adm/unix/config_files/check_vtk.m4 b/salome_adm/unix/config_files/check_vtk.m4 index 1b1a8d1a1..4b4b1454f 100644 --- a/salome_adm/unix/config_files/check_vtk.m4 +++ b/salome_adm/unix/config_files/check_vtk.m4 @@ -48,10 +48,16 @@ then AC_MSG_WARN(vtk needs OpenGL correct configuration, check configure output) fi +if test "x$x_libraries" != "x" +then + LXLIB="-L$x_libraries" +else + LXLIB="" +fi LOCAL_INCLUDES="$OGL_INCLUDES" -LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid $OGL_LIBS -L$x_libraries -lX11 -lXt" -TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS -L$x_libraries -lX11 -lXt" +LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid $OGL_LIBS $LXLIB -lX11 -lXt" +TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS $LXLIB -lX11 -lXt" if test -z $VTKHOME then @@ -64,7 +70,7 @@ fi dnl vtk headers CPPFLAGS_old="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES -Wno-deprecated" +CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES" AC_CHECK_HEADER(vtkPlane.h,vtk_ok="yes",vtk_ok="no") @@ -82,7 +88,7 @@ AC_CHECK_HEADER(vtkPlane.h,vtk_ok="yes",vtk_ok="no") # LIBS="$LIBS $TRY_LINK_LIBS" LIBS="$LIBS $LOCAL_LIBS" CPPFLAGS_old="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $VTK_INCLUDES -Wno-deprecated" + CPPFLAGS="$CPPFLAGS $VTK_INCLUDES" dnl VTKPY_MODULES="$VTKHOME/python" diff --git a/salome_adm/unix/config_files/production.m4 b/salome_adm/unix/config_files/production.m4 index aa161181a..aa6da52d4 100644 --- a/salome_adm/unix/config_files/production.m4 +++ b/salome_adm/unix/config_files/production.m4 @@ -55,7 +55,7 @@ enable_production=AC_ENABLE_PRODUCTION_DEFAULT)dnl if test "X$enable_production" = "Xyes"; then CFLAGS="$CFLAGS -O" - CXXFLAGS="$CXXFLAGS -O -Wno-deprecated " + CXXFLAGS="$CXXFLAGS -O " fi ]) @@ -89,7 +89,7 @@ enable_debug=AC_ENABLE_DEBUG_DEFAULT)dnl if test "X$enable_debug" = "Xyes"; then CFLAGS="$CFLAGS -g -D_DEBUG_ " - CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ -Wno-deprecated " + CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ " fi ]) diff --git a/salome_adm/unix/config_files/python.m4 b/salome_adm/unix/config_files/python.m4 index b86c21d35..b99b9d138 100644 --- a/salome_adm/unix/config_files/python.m4 +++ b/salome_adm/unix/config_files/python.m4 @@ -126,8 +126,8 @@ fi]) AC_MSG_CHECKING([if we need libdb]) PY_NEEDOPENDB=`nm $PYTHON_LIBA | grep dbopen | grep U` if test "x$PY_NEEDOPENDB" != "x"; then - PYTHON_LIBS="$PYTHON_LIBS -ldb" AC_MSG_RESULT(yes) + AC_CHECK_LIB(db,dbopen,PYTHON_LIBS="$PYTHON_LIBS -ldb",db_ok=no) else AC_MSG_RESULT(no) fi @@ -135,8 +135,8 @@ fi]) AC_MSG_CHECKING([if we need libdl]) PY_NEEDOPENDL=`nm $PYTHON_LIBA | grep dlopen | grep U` if test "x$PY_NEEDOPENDL" != "x"; then - PYTHON_LIBS="$PYTHON_LIBS -ldl" AC_MSG_RESULT(yes) + AC_CHECK_LIB(dl,dlopen,PYTHON_LIBS="$PYTHON_LIBS -ldl",dl_ok=no) else AC_MSG_RESULT(no) fi @@ -144,8 +144,8 @@ fi]) AC_MSG_CHECKING([if we need libutil]) PY_NEEDOPENPTY=`nm $PYTHON_LIBA | grep openpty | grep U` if test "x$PY_NEEDOPENPTY" != "x"; then - PYTHON_LIBS="$PYTHON_LIBS -lutil" AC_MSG_RESULT(yes) + AC_CHECK_LIB(util,openpty,PYTHON_LIBS="$PYTHON_LIBS -lutil",openpty_ok=no) else AC_MSG_RESULT(no) fi @@ -153,8 +153,8 @@ fi]) AC_MSG_CHECKING([if we need tcltk]) PY_NEEDTCLTK=`nm $PYTHON_LIBA | grep Tcl_Init | grep U` if test "x$PY_NEEDTCLTK" != "x"; then - PYTHON_LIBS="$PYTHON_LIBS -ltcl -ltk" AC_MSG_RESULT(yes) + AC_CHECK_LIB(tcl,Tcl_Init,PYTHON_LIBS="$PYTHON_LIBS -ltcl -ltk",tclinit_ok=no) else AC_MSG_RESULT(no) fi diff --git a/salome_adm/unix/depend.in b/salome_adm/unix/depend.in index 09a46645a..d97f074ba 100644 --- a/salome_adm/unix/depend.in +++ b/salome_adm/unix/depend.in @@ -43,7 +43,7 @@ depend:.depend echo Building dependencies for $$dep; \ obj=`basename $$dep .c`.lo; \ sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ - $(CC) $(C_DEPEND_FLAG) $(CPPFLAGS) $$dep 2>/dev/null | \ + $(DEPCC) $(C_DEPEND_FLAG) $(CPPFLAGS) $$dep 2>/dev/null | \ sed 's% $(srcdir)/% $$(srcdir)/%g' | \ sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' | \ sed 's% $(top_builddir)/% $$(top_builddir)/%g' | \ @@ -53,7 +53,7 @@ depend:.depend echo Building dependencies for $$dep; \ obj=`basename $$dep .cc`.lo; \ sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ - $(CXX) $(CXX_DEPEND_FLAG) $(CXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \ + $(DEPCXX) $(CXX_DEPEND_FLAG) $(DEPCXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \ sed 's% $(srcdir)/% $$(srcdir)/%g' | \ sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' | \ sed 's% $(top_builddir)/% $$(top_builddir)/%g' | \ @@ -63,7 +63,7 @@ depend:.depend echo Building dependencies for $$dep; \ obj=`basename $$dep .cxx`.lo; \ sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ - $(CXX) $(CXX_DEPEND_FLAG) $(CXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \ + $(DEPCXX) $(CXX_DEPEND_FLAG) $(DEPCXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \ sed 's% $(srcdir)/% $$(srcdir)/%g' | \ sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' | \ sed 's% $(top_builddir)/% $$(top_builddir)/%g' | \ diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in index d5e8ecc61..f0ab99393 100644 --- a/salome_adm/unix/make_commence.in +++ b/salome_adm/unix/make_commence.in @@ -2,7 +2,8 @@ inc_builddir=$(top_builddir)/include/salome @SET_MAKE@ -SHELL=/bin/sh +# Modifcation B. Secher portage sur osf +SHELL=@SHELL@ # header missing @@ -10,9 +11,10 @@ HAVE_SSTREAM=@HAVE_SSTREAM@ LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome +# LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome +LDFLAGS= @LDFLAGS@ -L$(top_builddir)/lib/salome # add libstdc++ to link c++ library with libtool ! -LDFLAGS+= -lstdc++ +LDFLAGS+= @STDLIB@ CP=@CP@ @@ -26,12 +28,15 @@ CPPFLAGS=@CPPFLAGS@ -I$(inc_builddir) -I$(srcdir) -I. CC = @CC@ CFLAGS = @CFLAGS@ +DEPCC = @DEPCC@ C_DEPEND_FLAG = @C_DEPEND_FLAG@ # C++ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ +DEPCXX = @DEPCXX@ +DEPCXXFLAGS = @DEPCXXFLAGS@ CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ # JAVA diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in index fe43d0e54..cc2fb2be6 100644 --- a/salome_adm/unix/make_conclude.in +++ b/salome_adm/unix/make_conclude.in @@ -95,7 +95,7 @@ $(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/ ln -sf $(CURDIR)/$< $@ $(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ) - $(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS) # copy python scripts in $(top_builddir)/bin/salome # diff --git a/src/Container/Component_i.cxx b/src/Container/Component_i.cxx index 400072d0f..6e29a3f97 100644 --- a/src/Container/Component_i.cxx +++ b/src/Container/Component_i.cxx @@ -26,13 +26,13 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOME_Component_i.hxx" #include "RegistryConnexion.hxx" #include "OpUtil.hxx" #include #include #include "utilities.h" +using namespace std; extern bool _Sleeping ; @@ -176,7 +176,7 @@ char* Engines_Component_i::nodeName() { return CORBA::string_dup( _nodeName.c_str() ) ; } -bool Killer( int ThreadId , int signum ) { +bool Killer( pthread_t ThreadId , int signum ) { if ( ThreadId ) { if ( signum == 0 ) { if ( pthread_cancel( ThreadId ) ) { @@ -272,7 +272,7 @@ bool Engines_Component_i::Resume_impl() { #include #include -long Engines_Component_i::CpuUsed_impl() { +CORBA::Long Engines_Component_i::CpuUsed_impl() { struct rusage usage ; long cpu ; if ( getrusage( RUSAGE_SELF , &usage ) == -1 ) { diff --git a/src/Container/Container_i.cxx b/src/Container/Container_i.cxx index aa3e364d2..9f9d19c61 100644 --- a/src/Container/Container_i.cxx +++ b/src/Container/Container_i.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include #include CORBA_SERVER_HEADER(SALOME_Component) #include "SALOME_Container_i.hxx" @@ -38,6 +37,7 @@ using namespace std; #include #include "utilities.h" +using namespace std; bool _Sleeping = false ; diff --git a/src/Container/Makefile.in b/src/Container/Makefile.in index fdf28da44..8e679514d 100644 --- a/src/Container/Makefile.in +++ b/src/Container/Makefile.in @@ -55,6 +55,6 @@ CPPFLAGS+= $(PYTHON_INCLUDES) LDFLAGS+= -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification -lSalomeLoggerServer -LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS) +LIBS += @LDEXPDYNFLAGS@ $(PYTHON_LIBS) @CONCLUDE@ diff --git a/src/Container/SALOME_Component_i.hxx b/src/Container/SALOME_Component_i.hxx index a5d462b65..9ec33c4b1 100644 --- a/src/Container/SALOME_Component_i.hxx +++ b/src/Container/SALOME_Component_i.hxx @@ -83,7 +83,7 @@ public: bool Stop_impl(); bool Suspend_impl(); bool Resume_impl(); - long CpuUsed_impl() ; + CORBA::Long CpuUsed_impl() ; protected: string _instanceName ; diff --git a/src/Container/SALOME_Container.cxx b/src/Container/SALOME_Container.cxx index 3914a57f3..9ec25ed91 100644 --- a/src/Container/SALOME_Container.cxx +++ b/src/Container/SALOME_Container.cxx @@ -26,8 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; -using namespace std; #include # include "Utils_ORB_INIT.hxx" @@ -37,6 +35,7 @@ using namespace std; #include #include #include "utilities.h" +using namespace std; //#define CHECKTIME #ifdef CHECKTIME diff --git a/src/Container/SALOME_Container_i.hxx b/src/Container/SALOME_Container_i.hxx index 2010bb047..a69758cb4 100644 --- a/src/Container/SALOME_Container_i.hxx +++ b/src/Container/SALOME_Container_i.hxx @@ -76,14 +76,14 @@ public: protected: SALOME_NamingService *_NS ; - string _library_path; - string _containerName; + std::string _library_path; + std::string _containerName; CORBA::ORB_var _orb; PortableServer::POA_var _poa; PortableServer::ObjectId * _id ; int _numInstance ; - map handle_map ; - map remove_map ; + std::map handle_map ; + std::map remove_map ; omni_mutex _numInstanceMutex ; // if several threads on the same object //private: diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx index 083cc4b14..81008bcc6 100644 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx +++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx @@ -24,14 +24,14 @@ // File : SALOME_DataTypeCatalog_Client.cxx // Module : SALOME -using namespace std; /* $Header$ */ -#include +#include #include "SALOME_NamingService.hxx" #include "SALOME_DataTypeCatalog.hh" #include #include "utilities.h" +using namespace std; int main(int argc,char **argv) { diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.cxx index 55217510a..2721fe1bf 100644 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.cxx +++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #define WRITE_CATA_DATA_TYPE #include "SALOME_DataTypeCatalog_Handler.hxx" +using namespace std; //---------------------------------------------------------------------- // Function : SALOME_DataTypeCatalog_Handler diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx index e9b4de72f..a8b4f6e05 100644 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx +++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx @@ -26,11 +26,11 @@ // Module : SALOME // $Header$ -using namespace std; -#include +#include #include "SALOME_NamingService.hxx" #include "SALOME_DataTypeCatalog_impl.hxx" #include "utilities.h" +using namespace std; int main(int argc,char **argv) { diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.cxx index fdcdd0738..72b51ce38 100644 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.cxx +++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOME_DataTypeCatalog_impl.hxx" #include +using namespace std; //---------------------------------------------------------------------- // Function : SALOME_DataTypeCatalogImpl diff --git a/src/HDFPersist/HDFascii.cc b/src/HDFPersist/HDFascii.cc index 49cc43099..e5719df68 100644 --- a/src/HDFPersist/HDFascii.cc +++ b/src/HDFPersist/HDFascii.cc @@ -1,4 +1,3 @@ -using namespace std; // File : SALOMEDS_Tool.cxx // Created : Mon Oct 21 16:24:34 2002 // Author : Sergey RUIN @@ -19,6 +18,7 @@ using namespace std; #include #include #include +using namespace std; bool CreateAttributeFromASCII(HDFinternalObject *father, FILE* fp); bool CreateDatasetFromASCII(HDFcontainerObject *father, FILE *fp); diff --git a/src/HDFPersist/HDFattribute.cc b/src/HDFPersist/HDFattribute.cc index b87cb0799..d4ec7b9c5 100644 --- a/src/HDFPersist/HDFattribute.cc +++ b/src/HDFPersist/HDFattribute.cc @@ -24,7 +24,6 @@ // File : HDFattribute.cc // Module : SALOME -using namespace std; extern "C" { #include "hdfi.h" @@ -32,6 +31,7 @@ extern "C" #include "HDFexception.hxx" #include "HDFattribute.hxx" #include "HDFinternalObject.hxx" +using namespace std; HDFattribute::HDFattribute(char *name,HDFinternalObject *father,hdf_type type, size_t size) : HDFobject(name) @@ -101,9 +101,12 @@ hdf_type HDFattribute::GetType() size_t HDFattribute::GetSize() { + int size; if(_size == 0) { - if((_size = HDFattrGetSize(_id)) < 0) + if((size = HDFattrGetSize(_id)) < 0) throw HDFexception("Can't determine the size of data in the attribute"); + else + _size = size; } return _size; } diff --git a/src/HDFPersist/HDFcontainerObject.cc b/src/HDFPersist/HDFcontainerObject.cc index 2f5398bd7..1a84b1db1 100644 --- a/src/HDFPersist/HDFcontainerObject.cc +++ b/src/HDFPersist/HDFcontainerObject.cc @@ -24,7 +24,6 @@ // File : HDFcontainerObject.cc // Module : SALOME -using namespace std; extern "C" { #include "hdfi.h" @@ -32,6 +31,7 @@ extern "C" #include "HDFcontainerObject.hxx" #include "HDFexception.hxx" #include "utilities.h" +using namespace std; HDFcontainerObject::HDFcontainerObject(char *name) : HDFinternalObject(name) diff --git a/src/HDFPersist/HDFconvert.cc b/src/HDFPersist/HDFconvert.cc index 2a6fe9b76..991b00e6c 100644 --- a/src/HDFPersist/HDFconvert.cc +++ b/src/HDFPersist/HDFconvert.cc @@ -24,8 +24,8 @@ // File : HDFconvert.cc // Module : SALOME -using namespace std; #include "HDFconvert.hxx" +using namespace std; int HDFConvert::FromAscii(const string& file, const HDFcontainerObject & hdf_container, const string& nomdataset) { @@ -68,10 +68,10 @@ int HDFConvert::FromAscii(const string& file, const HDFcontainerObject & hdf_con #endif // Creation du Dataset utilisateur - hdf_dataset = new HDFdataset::HDFdataset( (char *) nomdataset.c_str(), /*discard const */ - (HDFcontainerObject*) &hdf_container, /*discard const, pas de constructeur par référence */ - HDF_STRING, - &length_long,1); + hdf_dataset = new HDFdataset( (char *) nomdataset.c_str(), /*discard const */ + (HDFcontainerObject*) &hdf_container, /*discard const, pas de constructeur par référence */ + HDF_STRING, + &length_long,1); // Cree le Dataset sur le disk hdf_dataset->CreateOnDisk(); @@ -98,5 +98,7 @@ int HDFConvert::FromAscii(const string& file, const HDFcontainerObject & hdf_con perror("HDFConvert::FromAscii"); return -1; }; + + return 0; }; diff --git a/src/HDFPersist/HDFconvert.hxx b/src/HDFPersist/HDFconvert.hxx index 1e3b9c896..dcc0552d4 100644 --- a/src/HDFPersist/HDFconvert.hxx +++ b/src/HDFPersist/HDFconvert.hxx @@ -52,7 +52,7 @@ private: public: -static int FromAscii(const string& file, const HDFcontainerObject& hdf_container, const string& nomdataset); +static int FromAscii(const std::string& file, const HDFcontainerObject& hdf_container, const std::string& nomdataset); }; diff --git a/src/HDFPersist/HDFdataset.cc b/src/HDFPersist/HDFdataset.cc index 07d75e11c..fcd8375b4 100644 --- a/src/HDFPersist/HDFdataset.cc +++ b/src/HDFPersist/HDFdataset.cc @@ -24,17 +24,17 @@ // File : HDFdataset.cc // Module : SALOME -using namespace std; extern "C" { #include "hdfi.h" -#include } +#include #include "HDFdataset.hxx" #include "HDFcontainerObject.hxx" #include "HDFexception.hxx" -#include +#include +using namespace std; herr_t dataset_attr(hid_t loc_id, const char *attr_name, void *operator_data) { @@ -157,7 +157,7 @@ void HDFdataset::GetDim(hdf_size dim[]) else ndim = _ndim; _dim = new hdf_size[ndim]; - if ((ret == HDFdatasetGetDim(_id,_dim)) < 0) + if ((ret = HDFdatasetGetDim(_id,_dim)) < 0) throw HDFexception("Can't determine the size dimensions of the dataset "); } diff --git a/src/HDFPersist/HDFexception.hxx b/src/HDFPersist/HDFexception.hxx index b23d32101..a913f62e1 100644 --- a/src/HDFPersist/HDFexception.hxx +++ b/src/HDFPersist/HDFexception.hxx @@ -31,6 +31,6 @@ class HDFexception { public : HDFexception(const char *message) { - cerr << message << endl; + std::cerr << message << std::endl; } }; diff --git a/src/HDFPersist/HDFexplorer.cc b/src/HDFPersist/HDFexplorer.cc index 2e86f820e..114732d48 100644 --- a/src/HDFPersist/HDFexplorer.cc +++ b/src/HDFPersist/HDFexplorer.cc @@ -24,11 +24,11 @@ // File : HDFexplorer.cc // Module : SALOME -using namespace std; #include "HDFcontainerObject.hxx" #include "HDFexception.hxx" #include "HDFinternalObject.hxx" #include "HDFexplorer.hxx" +using namespace std; HDFexplorer::HDFexplorer(HDFcontainerObject *container) { diff --git a/src/HDFPersist/HDFfile.cc b/src/HDFPersist/HDFfile.cc index 469430a34..c43a33320 100644 --- a/src/HDFPersist/HDFfile.cc +++ b/src/HDFPersist/HDFfile.cc @@ -24,16 +24,16 @@ // File : HDFfile.cc // Module : SALOME -using namespace std; extern "C" { #include "hdfi.h" #include -#include } -#include +#include +#include #include "HDFfile.hxx" #include "HDFexception.hxx" +using namespace std; herr_t file_attr(hid_t loc_id, const char *attr_name, void *operator_data) { diff --git a/src/HDFPersist/HDFgroup.cc b/src/HDFPersist/HDFgroup.cc index b08f4de6e..ebeba2992 100644 --- a/src/HDFPersist/HDFgroup.cc +++ b/src/HDFPersist/HDFgroup.cc @@ -24,14 +24,14 @@ // File : HDFgroup.cc // Module : SALOME -using namespace std; extern "C" { #include "hdfi.h" -#include } +#include #include "HDFgroup.hxx" #include "HDFexception.hxx" +using namespace std; herr_t group_attr(hid_t loc_id, const char *attr_name, void *operator_data) { diff --git a/src/HDFPersist/HDFinternalObject.cc b/src/HDFPersist/HDFinternalObject.cc index 2cf6ed011..7ef6fb8e7 100644 --- a/src/HDFPersist/HDFinternalObject.cc +++ b/src/HDFPersist/HDFinternalObject.cc @@ -24,12 +24,12 @@ // File : HDFinternalObject.cc // Module : SALOME -using namespace std; extern "C" { #include "hdfi.h" } #include "HDFinternalObject.hxx" +using namespace std; HDFinternalObject::HDFinternalObject(char *name) : HDFobject(name) diff --git a/src/HDFPersist/HDFobject.cc b/src/HDFPersist/HDFobject.cc index 81fc689c8..eed36fdab 100644 --- a/src/HDFPersist/HDFobject.cc +++ b/src/HDFPersist/HDFobject.cc @@ -24,14 +24,14 @@ // File : HDFobject.cc // Module : SALOME -using namespace std; #include "HDFobject.hxx" extern "C" { #include "hdfi.h" -#include } +#include #include "utilities.h" +using namespace std; HDFobject::HDFobject(char *name) { diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx index 3b6e3cce5..6e48df6b9 100644 --- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx +++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx @@ -26,11 +26,11 @@ // Module : SALOME // $Header$ -using namespace std; #include #include #include #include +using namespace std; #include "OpUtil.hxx" #include "utilities.h" diff --git a/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx b/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx index b67b988b6..603c32814 100644 --- a/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx +++ b/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx @@ -26,7 +26,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "utilities.h" #include #include @@ -36,6 +35,7 @@ using namespace std; #include "SALOME_NamingService.hxx" #include "SALOME_LifeCycleCORBA.hxx" #include +using namespace std; int main (int argc, char * argv[]) { diff --git a/src/Loader/InquireServersQThread.cxx b/src/Loader/InquireServersQThread.cxx index 4fa67e651..087c13328 100644 --- a/src/Loader/InquireServersQThread.cxx +++ b/src/Loader/InquireServersQThread.cxx @@ -7,7 +7,6 @@ // Module : SALOME // $Header$ -using namespace std; #include "InquireServersQThread.h" #include @@ -36,6 +35,7 @@ using namespace std; #include "SALOME_NamingService.hxx" #include "utilities.h" #include "OpUtil.hxx" +using namespace std; #include CORBA_CLIENT_HEADER(SALOME_Session) #include CORBA_CLIENT_HEADER(SALOME_Registry) @@ -193,6 +193,7 @@ void InquireServersGUI::customEvent( QCustomEvent* pe ) int InquireServersGUI::getExitStatus() { myThread->getExitStatus(); + return 0; } InquireServersQThread::InquireServersQThread( InquireServersGUI* r ) diff --git a/src/Loader/SALOME_Session_Loader.cxx b/src/Loader/SALOME_Session_Loader.cxx index acd0ea377..993b72614 100644 --- a/src/Loader/SALOME_Session_Loader.cxx +++ b/src/Loader/SALOME_Session_Loader.cxx @@ -7,7 +7,6 @@ // Module : SALOME // $Header$ -using namespace std; /*! \file SALOME_Session_loader.cxx */ @@ -18,6 +17,7 @@ using namespace std; #include "Utils_SINGLETON.hxx" #include "SALOME_NamingService.hxx" #include "utilities.h" +using namespace std; //! CORBA client for SALOME Session server : launch GUI /*! diff --git a/src/Logger/SALOME_Logger_Server.cxx b/src/Logger/SALOME_Logger_Server.cxx index 3d40b45f7..68f36a94f 100644 --- a/src/Logger/SALOME_Logger_Server.cxx +++ b/src/Logger/SALOME_Logger_Server.cxx @@ -8,8 +8,9 @@ // Author : Vasily Rusyaev // Module : SALOME -using namespace std; #include +using namespace std; + #include "SALOME_Logger_Server.hxx" omni_mutex Logger::myLock; diff --git a/src/Logger/SALOME_Trace.cxx b/src/Logger/SALOME_Trace.cxx index ab5abd2b2..973d26480 100644 --- a/src/Logger/SALOME_Trace.cxx +++ b/src/Logger/SALOME_Trace.cxx @@ -8,14 +8,13 @@ // Author : Vasily Rusyaev // Module : SALOME -using namespace std; -#include "SALOME_Trace.hxx" #include #include -//#include #include #include +#include "SALOME_Trace.hxx" + ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// diff --git a/src/Logger/SALOME_Trace.hxx b/src/Logger/SALOME_Trace.hxx index e24239e8d..fd1bb73d3 100644 --- a/src/Logger/SALOME_Trace.hxx +++ b/src/Logger/SALOME_Trace.hxx @@ -42,9 +42,9 @@ # endif /* WNT */ +#include using namespace std; -#include #include "Logger.hh" class SALOME_Trace : public ostrstream diff --git a/src/MSG2QM/msg2qm.cxx b/src/MSG2QM/msg2qm.cxx index 097947db2..5322a33fc 100644 --- a/src/MSG2QM/msg2qm.cxx +++ b/src/MSG2QM/msg2qm.cxx @@ -24,7 +24,6 @@ // File : msg2qm.cxx // Module : SALOME -using namespace std; /**************************************************************************** ** $Id$ ** @@ -42,6 +41,7 @@ using namespace std; #include #include +using namespace std; static QString* defaultScope = 0; diff --git a/src/Makefile.in b/src/Makefile.in index 6bdf3f75d..110100d9e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -36,8 +36,11 @@ SUBDIRS = MSG2QM Logger Utils PatchQt NamingService Registry ModuleCatalog DataT RessourcesCatalog Notification NOTIFICATION_SWIG Container TestContainer LifeCycleCORBA \ HDFPersist OBJECT TOOLSDS SALOMEDS SALOMEGUI Plot2d VTKViewer OCCViewer SUPERVGraph Session \ SALOME_SWIG TOOLSGUI SALOME_PY RegistryDisplay ModuleGenerator \ - SALOME_PYQT Loader + Loader +ifeq (@pyqt_ok@,yes) + SUBDIRS+= SALOME_PYQT +endif ifeq (@WITHMPICH@,yes) SUBDIRS+= MPIContainer MPILifeCycleCORBA TestMPIContainer endif diff --git a/src/ModuleCatalog/Makefile.in b/src/ModuleCatalog/Makefile.in index c61ad8487..c82a9a52c 100644 --- a/src/ModuleCatalog/Makefile.in +++ b/src/ModuleCatalog/Makefile.in @@ -56,7 +56,7 @@ BIN_SRC = BIN_SERVER_IDL = SALOME_ModuleCatalog.idl CPPFLAGS+= $(QT_MT_INCLUDES) -CXXFLAGS+= -ftemplate-depth-42 +CXXFLAGS+= @CXXTMPDPTHFLAGS@ LDFLAGS+= $(QT_MT_LIBS) -lSalomeNS -lOpUtil -lSalomeLoggerServer @CONCLUDE@ diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx index 35e5c2e3e..034014eee 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx @@ -26,8 +26,8 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOME_ModuleCatalog_Acomponent_impl.hxx" +using namespace std; //---------------------------------------------------------------------- // Function : SALOME_ModuleCatalog_AcomponentImpl diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Client.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Client.cxx index c590b4b10..e930301d1 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Client.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Client.cxx @@ -24,7 +24,6 @@ // File : SALOME_ModuleCatalog_Client.cxx // Module : SALOME -using namespace std; /* $Header$ */ #include @@ -32,6 +31,7 @@ using namespace std; #include "SALOME_ModuleCatalog.hh" #include #include "utilities.h" +using namespace std; int main(int argc,char **argv) { diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx index 8f8f0e241..878828358 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx @@ -26,9 +26,9 @@ // Module : SALOME // $Header$ -using namespace std; #define WRITE_CATA_COMPONENT #include "SALOME_ModuleCatalog_Handler.hxx" +using namespace std; //---------------------------------------------------------------------- // Function : SALOME_ModuleCatalog_Handler diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx index 817f31b93..a350c1bc1 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx @@ -24,12 +24,12 @@ // File : SALOME_ModuleCatalog_Server.cxx // Module : SALOME -using namespace std; /* $Header$ */ -#include +#include #include "SALOME_NamingService.hxx" #include "SALOME_ModuleCatalog_impl.hxx" #include "utilities.h" +using namespace std; //#define CHECKTIME #ifdef CHECKTIME diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx index 9f912a7d3..8598599ed 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx @@ -26,13 +26,13 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOME_ModuleCatalog_impl.hxx" #include "SALOME_ModuleCatalog_Acomponent_impl.hxx" #include #include #include +using namespace std; static const char* SEPARATOR = ":"; diff --git a/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.cxx b/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.cxx index 6e36d52a9..40bc4a12a 100644 --- a/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.cxx +++ b/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.cxx @@ -25,8 +25,8 @@ // Author : Francis KLOSS // Module : SALOME -using namespace std; #include "NOTIFICATION_Swig.hxx" +using namespace std; // Swig notification supplier // -------------------------- diff --git a/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.hxx b/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.hxx index f2361808c..746f8e9ec 100644 --- a/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.hxx +++ b/src/NOTIFICATION_SWIG/NOTIFICATION_Swig.hxx @@ -25,8 +25,8 @@ // Author : Francis KLOSS // Module : SALOME -using namespace std; #include "NOTIFICATION.hxx" +using namespace std; class NOTIFICATION_Supplier_Swig { public: diff --git a/src/NamingService/SALOME_NamingService.cxx b/src/NamingService/SALOME_NamingService.cxx index c4865c196..6c71e5f49 100644 --- a/src/NamingService/SALOME_NamingService.cxx +++ b/src/NamingService/SALOME_NamingService.cxx @@ -26,11 +26,11 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOME_NamingService.hxx" #include "ServiceUnreachable.hxx" #include #include +using namespace std; //---------------------------------------------------------------------- /*! Function : SALOME_NamingService diff --git a/src/NamingService/ServiceUnreachable.cxx b/src/NamingService/ServiceUnreachable.cxx index 4b03e8d16..607c64710 100644 --- a/src/NamingService/ServiceUnreachable.cxx +++ b/src/NamingService/ServiceUnreachable.cxx @@ -24,7 +24,6 @@ // File : ServiceUnreachable.cxx // Module : SALOME -using namespace std; #include "ServiceUnreachable.hxx" ServiceUnreachable::ServiceUnreachable( void ): SALOME_Exception( "ServiceUnreachable" )