renamed DO_ONCE to SMPI_DO_ONCE.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5025 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index a93fc44..0566736 100644 (file)
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -100,6 +100,6 @@ int smpi_gettimeofday(struct timeval *tv, struct timezone *tz);
 void smpi_do_once_1(const char *file, int line);
 int  smpi_do_once_2(void);
 void smpi_do_once_3(void);
-#define DO_ONCE for (smpi_do_once_1(__FILE__, __LINE__); smpi_do_once_2(); smpi_do_once_3())
+#define SMPI_DO_ONCE for (smpi_do_once_1(__FILE__, __LINE__); smpi_do_once_2(); smpi_do_once_3())
 
 #endif

diff --git a/src/smpi/sample/compute2.c b/src/smpi/sample/compute2.c
index d9eb780..153e1ba 100644 (file)
--- a/src/smpi/sample/compute2.c
+++ b/src/smpi/sample/compute2.c
@@ -5,7 +5,7 @@ int main(int argc, char *argv[]) {
        double d;
        MPI_Init(&argc, &argv);
        d = 2.0;
-       DO_ONCE {
+       SMPI_DO_ONCE {
                for (i = 0; i < atoi(argv[1]); i++) {
                        if (d < 10000) {
                                d = d*d;

diff --git a/src/smpi/sample/compute3.c b/src/smpi/sample/compute3.c
index e2fe6ba..77cb535 100644 (file)
--- a/src/smpi/sample/compute3.c
+++ b/src/smpi/sample/compute3.c
@@ -5,7 +5,7 @@ int main(int argc, char *argv[]) {
        double d;
        MPI_Init(&argc, &argv);
        d = 2.0;
-       DO_ONCE {
+       SMPI_DO_ONCE {
                for (i = 0; i < atoi(argv[1]); i++) {
                        if (d < 10000) {
                                d = d*d;
@@ -15,7 +15,7 @@ int main(int argc, char *argv[]) {
                }
                printf("%d %f\n", i, d);
        }
-       DO_ONCE {
+       SMPI_DO_ONCE {
                for (i = 0; i < 2*atoi(argv[1]); i++) {
                        if (d < 10000) {
                                d = d*d;