From 18f29ded6a83875c27395d254c25e3d152ae1cc6 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 13 Jan 2011 11:44:23 +0100 Subject: Make cppcheck not complain about "'operator=' should return something" Signed-off-by: Martin Sustrik --- src/array.hpp | 4 ++-- src/atomic_counter.hpp | 2 +- src/atomic_ptr.hpp | 2 +- src/clock.hpp | 2 +- src/connect_session.hpp | 2 +- src/ctx.hpp | 2 +- src/decoder.hpp | 2 +- src/devpoll.hpp | 2 +- src/encoder.hpp | 2 +- src/epoll.hpp | 2 +- src/fq.hpp | 2 +- src/io_object.hpp | 2 +- src/kqueue.hpp | 2 +- src/lb.hpp | 2 +- src/mailbox.hpp | 2 +- src/mutex.hpp | 2 +- src/named_session.hpp | 2 +- src/object.hpp | 2 +- src/own.hpp | 2 +- src/pair.hpp | 2 +- src/pgm_receiver.hpp | 2 +- src/pgm_sender.hpp | 2 +- src/pipe.hpp | 4 ++-- src/poll.hpp | 2 +- src/poller_base.hpp | 2 +- src/pub.hpp | 2 +- src/pull.hpp | 2 +- src/push.hpp | 2 +- src/rep.hpp | 2 +- src/req.hpp | 2 +- src/select.hpp | 2 +- src/semaphore.hpp | 6 +++--- src/session.hpp | 2 +- src/socket_base.hpp | 2 +- src/sub.hpp | 2 +- src/swap.hpp | 4 ++++ src/tcp_connecter.hpp | 2 +- src/tcp_listener.hpp | 2 +- src/tcp_socket.hpp | 2 +- src/thread.hpp | 2 +- src/transient_session.hpp | 2 +- src/trie.hpp | 2 +- src/xpub.hpp | 2 +- src/xrep.hpp | 2 +- src/xreq.hpp | 2 +- src/xsub.hpp | 2 +- src/ypipe.hpp | 2 +- src/yqueue.hpp | 2 +- src/zmq_connecter.hpp | 2 +- src/zmq_engine.hpp | 2 +- src/zmq_init.hpp | 2 +- src/zmq_listener.hpp | 2 +- 52 files changed, 59 insertions(+), 55 deletions(-) (limited to 'src') diff --git a/src/array.hpp b/src/array.hpp index 8d92f54..e3662da 100644 --- a/src/array.hpp +++ b/src/array.hpp @@ -59,7 +59,7 @@ namespace zmq int array_index; array_item_t (const array_item_t&); - void operator = (const array_item_t&); + const array_item_t &operator = (const array_item_t&); }; // Fast array implementation with O(1) access to item, insertion and @@ -138,7 +138,7 @@ namespace zmq items_t items; array_t (const array_t&); - void operator = (const array_t&); + const array_t &operator = (const array_t&); }; } diff --git a/src/atomic_counter.hpp b/src/atomic_counter.hpp index 61128fc..099b4b7 100644 --- a/src/atomic_counter.hpp +++ b/src/atomic_counter.hpp @@ -140,7 +140,7 @@ namespace zmq #endif atomic_counter_t (const atomic_counter_t&); - void operator = (const atomic_counter_t&); + const atomic_counter_t& operator = (const atomic_counter_t&); }; } diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp index f68e4b7..81e7cda 100644 --- a/src/atomic_ptr.hpp +++ b/src/atomic_ptr.hpp @@ -135,7 +135,7 @@ namespace zmq #endif atomic_ptr_t (const atomic_ptr_t&); - void operator = (const atomic_ptr_t&); + const atomic_ptr_t &operator = (const atomic_ptr_t&); }; } diff --git a/src/clock.hpp b/src/clock.hpp index 2d473d5..bf895ec 100644 --- a/src/clock.hpp +++ b/src/clock.hpp @@ -51,7 +51,7 @@ namespace zmq uint64_t last_time; clock_t (const clock_t&); - void operator = (const clock_t&); + const clock_t &operator = (const clock_t&); }; } diff --git a/src/connect_session.hpp b/src/connect_session.hpp index 746109d..c93b70c 100644 --- a/src/connect_session.hpp +++ b/src/connect_session.hpp @@ -56,7 +56,7 @@ namespace zmq std::string address; connect_session_t (const connect_session_t&); - void operator = (const connect_session_t&); + const connect_session_t &operator = (const connect_session_t&); }; } diff --git a/src/ctx.hpp b/src/ctx.hpp index f35aa12..92684e6 100644 --- a/src/ctx.hpp +++ b/src/ctx.hpp @@ -143,7 +143,7 @@ namespace zmq mutex_t log_sync; ctx_t (const ctx_t&); - void operator = (const ctx_t&); + const ctx_t &operator = (const ctx_t&); }; } diff --git a/src/decoder.hpp b/src/decoder.hpp index 2179105..9da6f72 100644 --- a/src/decoder.hpp +++ b/src/decoder.hpp @@ -167,7 +167,7 @@ namespace zmq unsigned char *buf; decoder_base_t (const decoder_base_t&); - void operator = (const decoder_base_t&); + const decoder_base_t &operator = (const decoder_base_t&); }; // Decoder for 0MQ framing protocol. Converts data batches into messages. diff --git a/src/devpoll.hpp b/src/devpoll.hpp index 58029b8..84ec222 100644 --- a/src/devpoll.hpp +++ b/src/devpoll.hpp @@ -88,7 +88,7 @@ namespace zmq thread_t worker; devpoll_t (const devpoll_t&); - void operator = (const devpoll_t&); + const devpoll_t &operator = (const devpoll_t&); }; } diff --git a/src/encoder.hpp b/src/encoder.hpp index d135e2e..90517fe 100644 --- a/src/encoder.hpp +++ b/src/encoder.hpp @@ -175,7 +175,7 @@ namespace zmq unsigned char tmpbuf [10]; encoder_t (const encoder_t&); - void operator = (const encoder_t&); + const encoder_t &operator = (const encoder_t&); }; } diff --git a/src/epoll.hpp b/src/epoll.hpp index d4039e3..2188a9a 100644 --- a/src/epoll.hpp +++ b/src/epoll.hpp @@ -85,7 +85,7 @@ namespace zmq thread_t worker; epoll_t (const epoll_t&); - void operator = (const epoll_t&); + const epoll_t &operator = (const epoll_t&); }; } diff --git a/src/fq.hpp b/src/fq.hpp index fa5c89d..3a8946e 100644 --- a/src/fq.hpp +++ b/src/fq.hpp @@ -71,7 +71,7 @@ namespace zmq bool terminating; fq_t (const fq_t&); - void operator = (const fq_t&); + const fq_t &operator = (const fq_t&); }; } diff --git a/src/io_object.hpp b/src/io_object.hpp index 938e6ac..89745f3 100644 --- a/src/io_object.hpp +++ b/src/io_object.hpp @@ -69,7 +69,7 @@ namespace zmq poller_t *poller; io_object_t (const io_object_t&); - void operator = (const io_object_t&); + const io_object_t &operator = (const io_object_t&); }; } diff --git a/src/kqueue.hpp b/src/kqueue.hpp index ad02882..83ff407 100644 --- a/src/kqueue.hpp +++ b/src/kqueue.hpp @@ -92,7 +92,7 @@ namespace zmq thread_t worker; kqueue_t (const kqueue_t&); - void operator = (const kqueue_t&); + const kqueue_t &operator = (const kqueue_t&); }; } diff --git a/src/lb.hpp b/src/lb.hpp index 70b9a04..25e216d 100644 --- a/src/lb.hpp +++ b/src/lb.hpp @@ -67,7 +67,7 @@ namespace zmq bool terminating; lb_t (const lb_t&); - void operator = (const lb_t&); + const lb_t &operator = (const lb_t&); }; } diff --git a/src/mailbox.hpp b/src/mailbox.hpp index dc49aad..630b488 100644 --- a/src/mailbox.hpp +++ b/src/mailbox.hpp @@ -53,7 +53,7 @@ namespace zmq // Disable copying of mailbox_t object. mailbox_t (const mailbox_t&); - void operator = (const mailbox_t&); + const mailbox_t &operator = (const mailbox_t&); }; } diff --git a/src/mutex.hpp b/src/mutex.hpp index 7e54096..2793f94 100644 --- a/src/mutex.hpp +++ b/src/mutex.hpp @@ -110,7 +110,7 @@ namespace zmq // Disable copy construction and assignment. mutex_t (const mutex_t&); - void operator = (const mutex_t&); + const mutex_t &operator = (const mutex_t&); }; } diff --git a/src/named_session.hpp b/src/named_session.hpp index 428e108..101cdb2 100644 --- a/src/named_session.hpp +++ b/src/named_session.hpp @@ -48,7 +48,7 @@ namespace zmq blob_t name; named_session_t (const named_session_t&); - void operator = (const named_session_t&); + const named_session_t &operator = (const named_session_t&); }; } diff --git a/src/object.hpp b/src/object.hpp index c81656e..0fd6f47 100644 --- a/src/object.hpp +++ b/src/object.hpp @@ -116,7 +116,7 @@ namespace zmq void send_command (command_t &cmd_); object_t (const object_t&); - void operator = (const object_t&); + const object_t &operator = (const object_t&); }; } diff --git a/src/own.hpp b/src/own.hpp index 7090d62..cc55cd6 100644 --- a/src/own.hpp +++ b/src/own.hpp @@ -131,7 +131,7 @@ namespace zmq int term_acks; own_t (const own_t&); - void operator = (const own_t&); + const own_t &operator = (const own_t&); }; } diff --git a/src/pair.hpp b/src/pair.hpp index c644675..863dcd5 100644 --- a/src/pair.hpp +++ b/src/pair.hpp @@ -67,7 +67,7 @@ namespace zmq bool terminating; pair_t (const pair_t&); - void operator = (const pair_t&); + const pair_t &operator = (const pair_t&); }; } diff --git a/src/pgm_receiver.hpp b/src/pgm_receiver.hpp index 0ff4474..1c893ee 100644 --- a/src/pgm_receiver.hpp +++ b/src/pgm_receiver.hpp @@ -118,7 +118,7 @@ namespace zmq handle_t pipe_handle; pgm_receiver_t (const pgm_receiver_t&); - void operator = (const pgm_receiver_t&); + const pgm_receiver_t &operator = (const pgm_receiver_t&); }; } diff --git a/src/pgm_sender.hpp b/src/pgm_sender.hpp index 2ba75be..5d3dd91 100644 --- a/src/pgm_sender.hpp +++ b/src/pgm_sender.hpp @@ -95,7 +95,7 @@ namespace zmq size_t write_size; pgm_sender_t (const pgm_sender_t&); - void operator = (const pgm_sender_t&); + const pgm_sender_t &operator = (const pgm_sender_t&); }; } diff --git a/src/pipe.hpp b/src/pipe.hpp index a956ce3..4c94b40 100644 --- a/src/pipe.hpp +++ b/src/pipe.hpp @@ -113,7 +113,7 @@ namespace zmq bool terminating; reader_t (const reader_t&); - void operator = (const reader_t&); + const reader_t &operator = (const reader_t&); }; struct i_writer_events @@ -205,7 +205,7 @@ namespace zmq bool terminating; writer_t (const writer_t&); - void operator = (const writer_t&); + const writer_t &operator = (const writer_t&); }; } diff --git a/src/poll.hpp b/src/poll.hpp index 83dc6ce..bc5fb5c 100644 --- a/src/poll.hpp +++ b/src/poll.hpp @@ -92,7 +92,7 @@ namespace zmq thread_t worker; poll_t (const poll_t&); - void operator = (const poll_t&); + const poll_t &operator = (const poll_t&); }; } diff --git a/src/poller_base.hpp b/src/poller_base.hpp index b5fc1b6..0fd7997 100644 --- a/src/poller_base.hpp +++ b/src/poller_base.hpp @@ -75,7 +75,7 @@ namespace zmq atomic_counter_t load; poller_base_t (const poller_base_t&); - void operator = (const poller_base_t&); + const poller_base_t &operator = (const poller_base_t&); }; } diff --git a/src/pub.hpp b/src/pub.hpp index f398526..61b623a 100644 --- a/src/pub.hpp +++ b/src/pub.hpp @@ -35,7 +35,7 @@ namespace zmq private: pub_t (const pub_t&); - void operator = (const pub_t&); + const pub_t &operator = (const pub_t&); }; } diff --git a/src/pull.hpp b/src/pull.hpp index cd598d6..32b1c92 100644 --- a/src/pull.hpp +++ b/src/pull.hpp @@ -50,7 +50,7 @@ namespace zmq fq_t fq; pull_t (const pull_t&); - void operator = (const pull_t&); + const pull_t &operator = (const pull_t&); }; diff --git a/src/push.hpp b/src/push.hpp index d01e1ff..fc541b8 100644 --- a/src/push.hpp +++ b/src/push.hpp @@ -50,7 +50,7 @@ namespace zmq lb_t lb; push_t (const push_t&); - void operator = (const push_t&); + const push_t &operator = (const push_t&); }; } diff --git a/src/rep.hpp b/src/rep.hpp index 17e2686..6f44c6c 100644 --- a/src/rep.hpp +++ b/src/rep.hpp @@ -49,7 +49,7 @@ namespace zmq bool request_begins; rep_t (const rep_t&); - void operator = (const rep_t&); + const rep_t &operator = (const rep_t&); }; diff --git a/src/req.hpp b/src/req.hpp index b9ea401..b012f9e 100644 --- a/src/req.hpp +++ b/src/req.hpp @@ -49,7 +49,7 @@ namespace zmq bool message_begins; req_t (const req_t&); - void operator = (const req_t&); + const req_t &operator = (const req_t&); }; } diff --git a/src/select.hpp b/src/select.hpp index 916b87b..b3fae19 100644 --- a/src/select.hpp +++ b/src/select.hpp @@ -106,7 +106,7 @@ namespace zmq thread_t worker; select_t (const select_t&); - void operator = (const select_t&); + const select_t &operator = (const select_t&); }; } diff --git a/src/semaphore.hpp b/src/semaphore.hpp index 8b16230..75e57e3 100644 --- a/src/semaphore.hpp +++ b/src/semaphore.hpp @@ -77,7 +77,7 @@ namespace zmq HANDLE ev; semaphore_t (const semaphore_t&); - void operator = (const semaphore_t&); + const semaphore_t &operator = (const semaphore_t&); }; #elif defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_OPENVMS @@ -130,7 +130,7 @@ namespace zmq pthread_mutex_t mutex; semaphore_t (const semaphore_t&); - void operator = (const semaphore_t&); + const semaphore_t &operator = (const semaphore_t&); }; #else @@ -175,7 +175,7 @@ namespace zmq sem_t sem; semaphore_t (const semaphore_t&); - void operator = (const semaphore_t&); + const semaphore_t &operator = (const semaphore_t&); }; #endif diff --git a/src/session.hpp b/src/session.hpp index acadab9..615e4bc 100644 --- a/src/session.hpp +++ b/src/session.hpp @@ -141,7 +141,7 @@ namespace zmq } state; session_t (const session_t&); - void operator = (const session_t&); + const session_t &operator = (const session_t&); }; } diff --git a/src/socket_base.hpp b/src/socket_base.hpp index 6580b64..057f8b1 100644 --- a/src/socket_base.hpp +++ b/src/socket_base.hpp @@ -173,7 +173,7 @@ namespace zmq mutex_t sessions_sync; socket_base_t (const socket_base_t&); - void operator = (const socket_base_t&); + const socket_base_t &operator = (const socket_base_t&); }; } diff --git a/src/sub.hpp b/src/sub.hpp index 6ed2c12..d8822f3 100644 --- a/src/sub.hpp +++ b/src/sub.hpp @@ -41,7 +41,7 @@ namespace zmq private: sub_t (const sub_t&); - void operator = (const sub_t&); + const sub_t &operator = (const sub_t&); }; } diff --git a/src/swap.hpp b/src/swap.hpp index bc62fcd..503d35f 100644 --- a/src/swap.hpp +++ b/src/swap.hpp @@ -111,6 +111,10 @@ namespace zmq char *write_buf; int64_t write_buf_start_addr; + + // Disable copying of the swap object. + swap_t (const swap_t&); + const swap_t &operator = (const swap_t&); }; } diff --git a/src/tcp_connecter.hpp b/src/tcp_connecter.hpp index ca4f6c3..e8bc1e9 100644 --- a/src/tcp_connecter.hpp +++ b/src/tcp_connecter.hpp @@ -72,7 +72,7 @@ namespace zmq fd_t s; tcp_connecter_t (const tcp_connecter_t&); - void operator = (const tcp_connecter_t&); + const tcp_connecter_t &operator = (const tcp_connecter_t&); }; } diff --git a/src/tcp_listener.hpp b/src/tcp_listener.hpp index 0e21dba..5931502 100644 --- a/src/tcp_listener.hpp +++ b/src/tcp_listener.hpp @@ -64,7 +64,7 @@ namespace zmq fd_t s; tcp_listener_t (const tcp_listener_t&); - void operator = (const tcp_listener_t&); + const tcp_listener_t &operator = (const tcp_listener_t&); }; } diff --git a/src/tcp_socket.hpp b/src/tcp_socket.hpp index e18474e..431e290 100644 --- a/src/tcp_socket.hpp +++ b/src/tcp_socket.hpp @@ -63,7 +63,7 @@ namespace zmq // Disable copy construction of tcp_socket. tcp_socket_t (const tcp_socket_t&); - void operator = (const tcp_socket_t&); + const tcp_socket_t &operator = (const tcp_socket_t&); }; } diff --git a/src/thread.hpp b/src/thread.hpp index 46745a5..27bea68 100644 --- a/src/thread.hpp +++ b/src/thread.hpp @@ -69,7 +69,7 @@ namespace zmq #endif thread_t (const thread_t&); - void operator = (const thread_t&); + const thread_t &operator = (const thread_t&); }; } diff --git a/src/transient_session.hpp b/src/transient_session.hpp index 601f3d1..7571976 100644 --- a/src/transient_session.hpp +++ b/src/transient_session.hpp @@ -43,7 +43,7 @@ namespace zmq void detached (); transient_session_t (const transient_session_t&); - void operator = (const transient_session_t&); + const transient_session_t &operator = (const transient_session_t&); }; } diff --git a/src/trie.hpp b/src/trie.hpp index 07f29fd..ea78562 100644 --- a/src/trie.hpp +++ b/src/trie.hpp @@ -49,7 +49,7 @@ namespace zmq } next; trie_t (const trie_t&); - void operator = (const trie_t&); + const trie_t &operator = (const trie_t&); }; } diff --git a/src/xpub.hpp b/src/xpub.hpp index 13dd405..1a6fe76 100644 --- a/src/xpub.hpp +++ b/src/xpub.hpp @@ -65,7 +65,7 @@ namespace zmq bool terminating; xpub_t (const xpub_t&); - void operator = (const xpub_t&); + const xpub_t &operator = (const xpub_t&); }; } diff --git a/src/xrep.hpp b/src/xrep.hpp index 8c2e683..0c7d696 100644 --- a/src/xrep.hpp +++ b/src/xrep.hpp @@ -106,7 +106,7 @@ namespace zmq bool terminating; xrep_t (const xrep_t&); - void operator = (const xrep_t&); + const xrep_t &operator = (const xrep_t&); }; } diff --git a/src/xreq.hpp b/src/xreq.hpp index c515905..055c037 100644 --- a/src/xreq.hpp +++ b/src/xreq.hpp @@ -55,7 +55,7 @@ namespace zmq lb_t lb; xreq_t (const xreq_t&); - void operator = (const xreq_t&); + const xreq_t &operator = (const xreq_t&); }; } diff --git a/src/xsub.hpp b/src/xsub.hpp index 5937ae1..85f902c 100644 --- a/src/xsub.hpp +++ b/src/xsub.hpp @@ -70,7 +70,7 @@ namespace zmq bool more; xsub_t (const xsub_t&); - void operator = (const xsub_t&); + const xsub_t &operator = (const xsub_t&); }; } diff --git a/src/ypipe.hpp b/src/ypipe.hpp index a04cc4a..6865fa7 100644 --- a/src/ypipe.hpp +++ b/src/ypipe.hpp @@ -200,7 +200,7 @@ namespace zmq // Disable copying of ypipe object. ypipe_t (const ypipe_t&); - void operator = (const ypipe_t&); + const ypipe_t &operator = (const ypipe_t&); }; } diff --git a/src/yqueue.hpp b/src/yqueue.hpp index c05a0a7..1088906 100644 --- a/src/yqueue.hpp +++ b/src/yqueue.hpp @@ -189,7 +189,7 @@ namespace zmq // Disable copying of yqueue. yqueue_t (const yqueue_t&); - void operator = (const yqueue_t&); + const yqueue_t &operator = (const yqueue_t&); }; } diff --git a/src/zmq_connecter.hpp b/src/zmq_connecter.hpp index 0d3f41e..060f5c9 100644 --- a/src/zmq_connecter.hpp +++ b/src/zmq_connecter.hpp @@ -75,7 +75,7 @@ namespace zmq class session_t *session; zmq_connecter_t (const zmq_connecter_t&); - void operator = (const zmq_connecter_t&); + const zmq_connecter_t &operator = (const zmq_connecter_t&); }; } diff --git a/src/zmq_engine.hpp b/src/zmq_engine.hpp index 65bb85b..42f45be 100644 --- a/src/zmq_engine.hpp +++ b/src/zmq_engine.hpp @@ -78,7 +78,7 @@ namespace zmq bool plugged; zmq_engine_t (const zmq_engine_t&); - void operator = (const zmq_engine_t&); + const zmq_engine_t &operator = (const zmq_engine_t&); }; } diff --git a/src/zmq_init.hpp b/src/zmq_init.hpp index 12558a5..2ba46bb 100644 --- a/src/zmq_init.hpp +++ b/src/zmq_init.hpp @@ -84,7 +84,7 @@ namespace zmq class io_thread_t *io_thread; zmq_init_t (const zmq_init_t&); - void operator = (const zmq_init_t&); + const zmq_init_t &operator = (const zmq_init_t&); }; } diff --git a/src/zmq_listener.hpp b/src/zmq_listener.hpp index 1975de7..4714a38 100644 --- a/src/zmq_listener.hpp +++ b/src/zmq_listener.hpp @@ -58,7 +58,7 @@ namespace zmq class socket_base_t *socket; zmq_listener_t (const zmq_listener_t&); - void operator = (const zmq_listener_t&); + const zmq_listener_t &operator = (const zmq_listener_t&); }; } -- cgit v1.2.3