Merge branch 'master' of git://github.com/sustrik/zeromq2

4 files changed, 16 insertions, 16 deletions

diff --git a/perf/cpp/local_lat.cpp b/perf/cpp/local_lat.cpp
index 9260f0a..343ca74 100644
--- a/perf/cpp/local_lat.cpp
+++ b/perf/cpp/local_lat.cpp
@@ -27,13 +27,13 @@
 int main (int argc, char *argv [])
 {
     if (argc != 4) {
-        printf ("usage: local_lat <bind-to> <roundtrip-count> "
-            "<message-size>\n");
+        printf ("usage: local_lat <bind-to> <message-size> "
+            "<roundtrip-count>\n");
         return 1;
     }
     const char *bind_to = argv [1];
-    int roundtrip_count = atoi (argv [2]);
-    size_t message_size = (size_t) atoi (argv [3]);
+    size_t message_size = (size_t) atoi (argv [2]);
+    int roundtrip_count = atoi (argv [3]);
 
     zmq::context_t ctx (1, 1);
 
diff --git a/perf/cpp/local_thr.cpp b/perf/cpp/local_thr.cpp
index 3e961de..ca81ba9 100644
--- a/perf/cpp/local_thr.cpp
+++ b/perf/cpp/local_thr.cpp
@@ -28,13 +28,13 @@
 int main (int argc, char *argv [])
 {
     if (argc != 4) {
-        printf ("usage: local_thr <bind-to> <message-count> "
-            "<message-size>\n");
+        printf ("usage: local_thr <bind-to> <message-size> "
+            "<message-count>\n");
         return 1;
     }
     const char *bind_to = argv [1];
-    int message_count = atoi (argv [2]);
-    size_t message_size = (size_t) atoi (argv [3]);
+    size_t message_size = (size_t) atoi (argv [2]);
+    int message_count = atoi (argv [3]);
 
     zmq::context_t ctx (1, 1);
 
diff --git a/perf/cpp/remote_lat.cpp b/perf/cpp/remote_lat.cpp
index 169ed1e..c3ded10 100644
--- a/perf/cpp/remote_lat.cpp
+++ b/perf/cpp/remote_lat.cpp
@@ -27,13 +27,13 @@
 int main (int argc, char *argv [])
 {
     if (argc != 4) {
-        printf ("usage: remote_lat <connect-to> <roundtrip-count> "
-            "<message-size>\n");
+        printf ("usage: remote_lat <connect-to> <message-size> "
+            "<roundtrip-count>\n");
         return 1;
     }
     const char *connect_to = argv [1];
-    int roundtrip_count = atoi (argv [2]);
-    size_t message_size = (size_t) atoi (argv [3]);
+    size_t message_size = (size_t) atoi (argv [2]);
+    int roundtrip_count = atoi (argv [3]);
 
     zmq::context_t ctx (1, 1);
 
diff --git a/perf/cpp/remote_thr.cpp b/perf/cpp/remote_thr.cpp
index 06946f5..5474c6a 100644
--- a/perf/cpp/remote_thr.cpp
+++ b/perf/cpp/remote_thr.cpp
@@ -27,13 +27,13 @@
 int main (int argc, char *argv [])
 {
     if (argc != 4) {
-        printf ("usage: remote_thr <connect-to> <message-count> "
-            "<message-size>\n");
+        printf ("usage: remote_thr <connect-to> <message-size> "
+            "<message-count>\n");
         return 1;
     }
     const char *connect_to = argv [1];
-    int message_count = atoi (argv [2]);
-    size_t message_size = (size_t) atoi (argv [3]);
+    size_t message_size = (size_t) atoi (argv [2]);
+    int message_count = atoi (argv [3]);
 
     zmq::context_t ctx (1, 1);