diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-02-23 17:22:52 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-02-23 17:22:52 +0100 |
| commit | 025c9e173c58971993858ea66fb2eeaf08de195d (patch) | |
| tree | 7f3f6263ddcc33c9c2aedac5b808de9e40d60b16 | |
| parent | 71b4947f951f0120e4aadccb42f2452bb95dba06 (diff) | |
execution disabled on certain source files; some comments on java binding; MSVC temp files added to .gitignore
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r--[-rwxr-xr-x] | bindings/java/Context.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bindings/java/Socket.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bindings/java/org/zmq/Context.java | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | bindings/java/org/zmq/Socket.java | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/chat/display.cpp | 0 |
6 files changed, 13 insertions, 0 deletions
@@ -9,6 +9,8 @@ config.log aclocal.m4 autom4te.cache *.o +*.class +*.ncb *.lo *.loT *.la @@ -16,6 +18,8 @@ autom4te.cache *.pdf *.ps .* +*~ +.*~ src/platform.hpp* src/stamp-h1 devices/zmq_forwarder/zmq_forwarder @@ -37,6 +41,11 @@ doc/*.7 doc/*.html doc/*.xml bindings/python/setup.py +bindings/java/org_zmq_*.h src/libzmq.pc +lib/ +builds/msvc/*/*.user +builds/msvc/*/Debug +builds/msvc/*/Release foreign/openpgm/* !foreign/openpgm/*.tar.bz2 diff --git a/bindings/java/Context.cpp b/bindings/java/Context.cpp index d2b5e42..d2b5e42 100755..100644 --- a/bindings/java/Context.cpp +++ b/bindings/java/Context.cpp diff --git a/bindings/java/Socket.cpp b/bindings/java/Socket.cpp index adea3fa..adea3fa 100755..100644 --- a/bindings/java/Socket.cpp +++ b/bindings/java/Socket.cpp diff --git a/bindings/java/org/zmq/Context.java b/bindings/java/org/zmq/Context.java index 219b26c..1b5ecb4 100755..100644 --- a/bindings/java/org/zmq/Context.java +++ b/bindings/java/org/zmq/Context.java @@ -44,6 +44,8 @@ public class Context { /** * Get the underlying context handle. + * This is private because it is only accessed from JNI, where + * Java access controls are ignored. * * @return the internal 0MQ context handle. */ diff --git a/bindings/java/org/zmq/Socket.java b/bindings/java/org/zmq/Socket.java index 1815b53..84e2c52 100755..100644 --- a/bindings/java/org/zmq/Socket.java +++ b/bindings/java/org/zmq/Socket.java @@ -121,6 +121,8 @@ public class Socket { /** * Get the underlying socket handle. + * This is private because it is only accessed from JNI, where + * Java access controls are ignored. * * @return the internal 0MQ socket handle. */ diff --git a/examples/chat/display.cpp b/examples/chat/display.cpp index c689352..c689352 100755..100644 --- a/examples/chat/display.cpp +++ b/examples/chat/display.cpp |