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

4 files changed, 9 insertions, 9 deletions

diff --git a/perf/ruby/local_lat.rb b/perf/ruby/local_lat.rb
index a299630..b27e8bc 100644
--- a/perf/ruby/local_lat.rb
+++ b/perf/ruby/local_lat.rb
@@ -27,8 +27,8 @@ bind_to = ARGV[0]
 message_size = ARGV[1].to_i
 roundtrip_count = ARGV[2].to_i
 			
-ctx = Context.new(1, 1, 0)
-s = Socket.new(ctx, REP);
+ctx = ZMQ::Context.new(1, 1, 0)
+s = ZMQ::Socket.new(ctx, ZMQ::REP);
 s.bind(bind_to);
 
 for i in 0...roundtrip_count do
diff --git a/perf/ruby/local_thr.rb b/perf/ruby/local_thr.rb
index f1c0fdf..b20ca60 100644
--- a/perf/ruby/local_thr.rb
+++ b/perf/ruby/local_thr.rb
@@ -27,9 +27,9 @@ bind_to = ARGV[0]
 message_size = ARGV[1].to_i
 message_count = ARGV[2].to_i
 					
-ctx = Context.new(1, 1, 0)
-s = Socket.new(ctx, SUB);
-s.setsockopt(SUBSCRIBE, "");
+ctx = ZMQ::Context.new(1, 1, 0)
+s = ZMQ::Socket.new(ctx, ZMQ::SUB);
+s.setsockopt(ZMQ::SUBSCRIBE, "");
 
 #  Add your socket options here.
 #  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
diff --git a/perf/ruby/remote_lat.rb b/perf/ruby/remote_lat.rb
index 7449aff..ea8cf8e 100644
--- a/perf/ruby/remote_lat.rb
+++ b/perf/ruby/remote_lat.rb
@@ -27,8 +27,8 @@ connect_to = ARGV[0]
 message_size = ARGV[1].to_i
 roundtrip_count = ARGV[2].to_i
 					
-ctx = Context.new(1, 1, 0)
-s = Socket.new(ctx, REQ);
+ctx = ZMQ::Context.new(1, 1, 0)
+s = ZMQ::Socket.new(ctx, ZMQ::REQ);
 s.connect(connect_to);
 
 msg = "#{'0'*message_size}"
diff --git a/perf/ruby/remote_thr.rb b/perf/ruby/remote_thr.rb
index 9edd1c6..b2dada6 100644
--- a/perf/ruby/remote_thr.rb
+++ b/perf/ruby/remote_thr.rb
@@ -27,8 +27,8 @@ connect_to = ARGV[0]
 message_size = ARGV[1].to_i
 message_count = ARGV[2].to_i
 			
-ctx = Context.new(1, 1, 0)
-s = Socket.new(ctx, PUB);
+ctx = ZMQ::Context.new(1, 1, 0)
+s = ZMQ::Socket.new(ctx, ZMQ::PUB);
 
 #  Add your socket options here.
 #  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.