diff options
author | bustico | 2013-11-25 10:43:04 +0000 |
---|---|---|
committer | bustico | 2013-11-25 10:43:04 +0000 |
commit | 3bba51658b025ee6075eb9ebfe0ee32ee8b2c750 (patch) | |
tree | 22d6408e755b99677e2905638279fc82b63c24b4 /tools/ivythroughput.cpp | |
parent | 1fb1bb59c936ea4d752a12db3d73f490e5b7b6a1 (diff) | |
download | ivy-c-3bba51658b025ee6075eb9ebfe0ee32ee8b2c750.zip ivy-c-3bba51658b025ee6075eb9ebfe0ee32ee8b2c750.tar.gz ivy-c-3bba51658b025ee6075eb9ebfe0ee32ee8b2c750.tar.bz2 ivy-c-3bba51658b025ee6075eb9ebfe0ee32ee8b2c750.tar.xz |
° protect gcc pragma not available on old version of gcc
° tcl loop compiled for tcl8.4
Diffstat (limited to 'tools/ivythroughput.cpp')
-rw-r--r-- | tools/ivythroughput.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/ivythroughput.cpp b/tools/ivythroughput.cpp index e1734d5..68543e9 100644 --- a/tools/ivythroughput.cpp +++ b/tools/ivythroughput.cpp @@ -281,7 +281,7 @@ void emetteur (const char* bus, KindOfTest kod, int testDuration, # | | | __/ | (__ | __/ | | \ |_ | __/ | |_| | | | # |_| \___| \___| \___| |_| \__| \___| \__,_| |_| */ -#if defined(__GNUC__) +#if defined(__GNUC__) && __GNUC_PREREQ(4,7) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-security" #endif @@ -320,7 +320,7 @@ void recepteur_tp (const char* bus, KindOfTest kod, unsigned int inst, IvyStart (bus); IvyMainLoop (); } -#if defined(__GNUC__) +#if defined(__GNUC__) && __GNUC_PREREQ(4,7) #pragma GCC diagnostic pop #endif @@ -346,12 +346,12 @@ void recepteur_ml (const char* bus, KindOfTest kod, unsigned int inst, debugInt++; string reg = *iter; if (regexpAreUniq) { (reg += " ") += stream.str();} -#if defined(__GNUC__) +#if defined(__GNUC__) && __GNUC_PREREQ(4,7) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-security" #endif bindIdList.push_back (IvyBindMsg (recepteurCB, (void *) long(inst), reg.c_str())); -#if defined(__GNUC__) +#if defined(__GNUC__) && __GNUC_PREREQ(4,7) #pragma GCC diagnostic pop #endif @@ -555,12 +555,12 @@ void sendAllMessageCB (TimerId id, void *user_data, unsigned long delta) IvySendMsg ("startOfSequence"); ListOfString::iterator iter; for (iter=messages->begin(); iter != messages->end(); iter++) { -#if defined(__GNUC__) +#if defined(__GNUC__) && __GNUC_PREREQ(4,7) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-security" #endif envoyes += IvySendMsg ((*iter).c_str()); -#if defined(__GNUC__) +#if defined(__GNUC__) && __GNUC_PREREQ(4,7) #pragma GCC diagnostic pop #endif } @@ -641,13 +641,13 @@ void desabonneEtReabonneCB (TimerId id, void *user_data, unsigned long delta) ListOfString::const_iterator iter2; for (iter2=mds->regexps->begin(); iter2 != mds->regexps->end(); iter2++) { string reg = *iter2; -#if defined(__GNUC__) +#if defined(__GNUC__) && __GNUC_PREREQ(4,7) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-security" #endif mds->bindIdList->push_back (IvyBindMsg (recepteurCB, (void *) long(mds->inst), reg.c_str())); -#if defined(__GNUC__) +#if defined(__GNUC__) && __GNUC_PREREQ(4,7) #pragma GCC diagnostic pop #endif } |