Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 8ad34ae091162226fd4d1de7b1eb562d > files > 7

salome-5.1.3-7mdv2010.1.src.rpm

--- src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx.orig	2010-02-22 17:21:02.576153718 -0300
+++ src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx	2010-02-22 17:22:14.376152049 -0300
@@ -23,6 +23,7 @@
 #include <cmath>
 #include <list>
 #include <stdexcept>
+#include <stdlib.h>
 
 //================================================================================
 /*!
--- src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx.orig	2010-02-22 17:29:18.960154025 -0300
+++ src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx	2010-02-22 17:30:09.536237102 -0300
@@ -161,7 +161,7 @@
     maxtime = maxreq ;
     //    MyMPIAccessDEC->InitTime( time , nextdeltatime , maxtime ) ;
   }
-  time_t begintime = std::time(NULL) ;
+  time_t begintime = ::time(NULL) ;
   //  for ( time = 0 ; time <= maxtime ; time+=deltatime[myrank] ) {
   for ( time = 0 ; time <= maxtime && nextdeltatime != 0 ; time+=nextdeltatime ) {
     nextdeltatime = deltatime[myrank] ;
@@ -323,7 +323,7 @@
          << " RecvRequests = 0 OK" << endl ;
   }
 
-  time_t endtime = std::time(NULL) ;
+  time_t endtime = ::time(NULL) ;
   cout << "test_AllToAllvTimeDEC" << myrank << " begintime " << begintime << " endtime " << endtime
        << " elapse " << endtime-begintime << " " << maxtime/deltatime[myrank]
        << " calls to AllToAll" << endl ;
@@ -348,7 +348,7 @@
 
   //  MPI_Finalize();
 
-  endtime = std::time(NULL) ;
+  endtime = ::time(NULL) ;
 
   cout << "test_AllToAllvTimeDEC" << myrank << " OK begintime " << begintime << " endtime " << endtime
        << " elapse " << endtime-begintime << " " << maxtime/deltatime[myrank]
--- src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx.orig	2010-02-22 17:38:07.532532704 -0300
+++ src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx	2010-02-22 17:38:20.236152131 -0300
@@ -150,7 +150,7 @@
      maxtime[i] = maxreq ;
      nextdeltatime[i] = deltatime[i] ;
   }
-  time_t begintime = std::time(NULL) ;
+  time_t begintime = ::time(NULL) ;
   for ( time[myrank] = 0 ; time[myrank] <= maxtime[myrank] && nextdeltatime[myrank] != 0 ;
         time[myrank]+=nextdeltatime[myrank] ) {
 //local and target times
@@ -298,7 +298,7 @@
          << " RecvRequests = 0 OK" << endl ;
   }
 
-  time_t endtime = std::time(NULL) ;
+  time_t endtime = ::time(NULL) ;
   cout << "test_AllToAllvTimeDoubleDEC" << myrank << " begintime " << begintime << " endtime " << endtime
        << " elapse " << endtime-begintime << " " << maxtime[myrank]/deltatime[myrank]
        << " calls to AllToAll" << endl ;
@@ -322,7 +322,7 @@
 
 //  MPI_Finalize();
 
-  endtime = std::time(NULL) ;
+  endtime = ::time(NULL) ;
 
   cout << "test_AllToAllvTimeDoubleDEC" << myrank << " OK begintime " << begintime << " endtime " << endtime
        << " elapse " << endtime-begintime << " " << maxtime[myrank]/deltatime[myrank]
--- src5.1.3/HXX2SALOME_SRC_5.1.3/src/hxx2salome.cpp.orig	2010-02-23 16:29:12.773601146 -0300
+++ src5.1.3/HXX2SALOME_SRC_5.1.3/src/hxx2salome.cpp	2010-02-23 16:29:28.309033404 -0300
@@ -244,6 +244,6 @@
   printf( "command: %s\n", qPrintable( command ) );
 #endif
   QApplication::setOverrideCursor( Qt::WaitCursor );
-  std::system( command.toLatin1().constData() );
+  ::system( command.toLatin1().constData() );
   QApplication::restoreOverrideCursor();
 }
--- src5.1.3/GHS3DPRLPLUGIN_SRC_5.1.3/src/tepal2med/ghs3dprl_mesh_wrap.h.orig	2010-02-23 21:13:33.029600182 -0300
+++ src5.1.3/GHS3DPRLPLUGIN_SRC_5.1.3/src/tepal2med/ghs3dprl_mesh_wrap.h	2010-02-23 21:38:28.798596650 -0300
@@ -26,6 +26,9 @@
 #ifndef GHS3DPRL_MESH_WRAP_H
 #define GHS3DPRL_MESH_WRAP_H
 
+#include <med.hxx>
+#include <med_proto.hxx>
+
 #include <string>
 #include <map>
 #include <QHash>