5 files changed, 32 insertions, 7 deletions
diff --git a/perf/cpp/Makefile.am b/perf/cpp/Makefile.am
new file mode 100644
index 0000000..7870943
--- /dev/null
+++ b/perf/cpp/Makefile.am
@@ -0,0 +1,20 @@
+INCLUDES = -I$(top_builddir)/include
+
+bin_PROGRAMS = local_lat remote_lat local_thr remote_thr
+
+local_lat_LDADD = $(top_builddir)/src/libzmq.la
+local_lat_SOURCES = local_lat.cpp
+local_lat_CXXFLAGS = -Wall -pedantic -Werror
+
+remote_lat_LDADD = $(top_builddir)/src/libzmq.la
+remote_lat_SOURCES = remote_lat.cpp
+remote_lat_CXXFLAGS = -Wall -pedantic -Werror
+
+local_thr_LDADD = $(top_builddir)/src/libzmq.la
+local_thr_SOURCES = local_thr.cpp
+local_thr_CXXFLAGS = -Wall -pedantic -Werror
+
+remote_thr_LDADD = $(top_builddir)/src/libzmq.la
+remote_thr_SOURCES = remote_thr.cpp
+remote_thr_CXXFLAGS = -Wall -pedantic -Werror
+
diff --git a/perf/cpp/local_lat.cpp b/perf/cpp/local_lat.cpp
index 3a9afcb..9260f0a 100644
--- a/perf/cpp/local_lat.cpp
+++ b/perf/cpp/local_lat.cpp
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <assert.h>
+#include <stddef.h>
 
 int main (int argc, char *argv [])
 {
@@ -32,7 +33,7 @@ int main (int argc, char *argv [])
     }
     const char *bind_to = argv [1];
     int roundtrip_count = atoi (argv [2]);
-    int message_size = atoi (argv [3]);
+    size_t message_size = (size_t) atoi (argv [3]);
 
     zmq::context_t ctx (1, 1);
 
diff --git a/perf/cpp/local_thr.cpp b/perf/cpp/local_thr.cpp
index 576ac42..fdcbc8d 100644
--- a/perf/cpp/local_thr.cpp
+++ b/perf/cpp/local_thr.cpp
@@ -21,6 +21,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/time.h>
 
 int main (int argc, char *argv [])
@@ -32,7 +34,7 @@ int main (int argc, char *argv [])
     }
     const char *bind_to = argv [1];
     int message_count = atoi (argv [2]);
-    int message_size = atoi (argv [3]);
+    size_t message_size = (size_t) atoi (argv [3]);
 
     zmq::context_t ctx (1, 1);
 
@@ -59,10 +61,10 @@ int main (int argc, char *argv [])
     end.tv_sec -= start.tv_sec;
     start.tv_sec = 0;
 
-    long long elapsed = (end.tv_sec * 1000000 + end.tv_usec) -
-        (start.tv_sec * 1000000 + start.tv_usec);
+    uint64_t elapsed = ((uint64_t) end.tv_sec * 1000000 + end.tv_usec) -
+        ((uint64_t) start.tv_sec * 1000000 + start.tv_usec);
 
-    long long throughput = (long long) message_count * 1000000 / elapsed;
+    uint64_t throughput = (uint64_t) message_count * 1000000 / elapsed;
 
     printf ("message size: %d [B]\n", (int) message_size);
     printf ("message count: %d\n", (int) message_count);
diff --git a/perf/cpp/remote_lat.cpp b/perf/cpp/remote_lat.cpp
index 9ac758b..3472fd8 100644
--- a/perf/cpp/remote_lat.cpp
+++ b/perf/cpp/remote_lat.cpp
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <stddef.h>
 #include <sys/time.h>
 
 int main (int argc, char *argv [])
@@ -32,7 +33,7 @@ int main (int argc, char *argv [])
     }
     const char *connect_to = argv [1];
     int roundtrip_count = atoi (argv [2]);
-    int message_size = atoi (argv [3]);
+    size_t message_size = (size_t) atoi (argv [3]);
 
     zmq::context_t ctx (1, 1);
 
diff --git a/perf/cpp/remote_thr.cpp b/perf/cpp/remote_thr.cpp
index 54536fd..06946f5 100644
--- a/perf/cpp/remote_thr.cpp
+++ b/perf/cpp/remote_thr.cpp
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <assert.h>
+#include <stddef.h>
 
 int main (int argc, char *argv [])
 {
@@ -32,7 +33,7 @@ int main (int argc, char *argv [])
     }
     const char *connect_to = argv [1];
     int message_count = atoi (argv [2]);
-    int message_size = atoi (argv [3]);
+    size_t message_size = (size_t) atoi (argv [3]);
 
     zmq::context_t ctx (1, 1);