diff options
| author | Martin Sustrik <sustrik@fastmq.com> | 2009-09-09 09:07:11 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@fastmq.com> | 2009-09-09 09:07:11 +0200 |
| commit | c99f39abc669084fd3a94675ee98e235448ad5a4 (patch) | |
| tree | 26480a694e81daceb6f3f97ec94147011c389e6d /src/zmq.cpp | |
| parent | 37d8371967308ab1e541cf58b91e368b3e0b526c (diff) | |
| parent | cb78991f8e20fa35d99fa209be659c0aed59de47 (diff) | |
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'src/zmq.cpp')
| -rw-r--r-- | src/zmq.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/zmq.cpp b/src/zmq.cpp index 63a7b4b..c966448 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -292,4 +292,5 @@ unsigned long zmq_stopwatch_stop (void *watch_) uint64_t start = *(uint64_t*) watch_; free (watch_); return (unsigned long) (end - start); -}
\ No newline at end of file +} + |