summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/examples/Web_Crawler/Iterators.cpp4
-rw-r--r--ACE/performance-tests/Misc/context_switch_time.cpp2
3 files changed, 8 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index c38f4eaeccb..f5c65ba178b 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jan 31 20:19:16 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/Web_Crawler/Iterators.cpp:
+ * performance-tests/Misc/context_switch_time.cpp:
+ Fixed gcc 4.7 warning
+
Tue Jan 31 20:17:35 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp:
diff --git a/ACE/examples/Web_Crawler/Iterators.cpp b/ACE/examples/Web_Crawler/Iterators.cpp
index 2f0da8f1c73..661af3d847a 100644
--- a/ACE/examples/Web_Crawler/Iterators.cpp
+++ b/ACE/examples/Web_Crawler/Iterators.cpp
@@ -4,8 +4,6 @@
#include "Options.h"
#include "Iterators.h"
-
-
URL_Iterator::~URL_Iterator (void)
{
}
@@ -32,7 +30,7 @@ HTML_Body_Iterator::next (ACE_CString &url)
int href_index = 0;
for (buf = this->url_.stream ().recv (len);
- buf > 0;
+ buf != 0;
buf = this->url_.stream ().recv (len))
{
diff --git a/ACE/performance-tests/Misc/context_switch_time.cpp b/ACE/performance-tests/Misc/context_switch_time.cpp
index 293f687d434..175ac6b9637 100644
--- a/ACE/performance-tests/Misc/context_switch_time.cpp
+++ b/ACE/performance-tests/Misc/context_switch_time.cpp
@@ -1142,7 +1142,7 @@ get_options (int argc, ACE_TCHAR *argv[])
int
ACE_TMAIN (int argc, ACE_TCHAR *argv [])
{
- ACE_LOG_MSG->open (argv[0] > 0 ? argv[0] : ACE_TEXT("context_switch_time"));
+ ACE_LOG_MSG->open (argv[0] != 0 ? argv[0] : ACE_TEXT("context_switch_time"));
if (get_options (argc, argv))
ACE_OS::exit (-1);