diff options
author | Yang Gao <yangg@google.com> | 2015-06-01 14:32:38 -0700 |
---|---|---|
committer | Yang Gao <yangg@google.com> | 2015-06-01 14:32:38 -0700 |
commit | 69fe0759bee3579d743d2e71f36504366ee0d275 (patch) | |
tree | c606530611fb27e57ebd9786c4c89c814dce9783 /include/grpc++/impl | |
parent | 7b49a7737c3d323686ebdac5640672241eae89cb (diff) |
Various minor fixes
Diffstat (limited to 'include/grpc++/impl')
-rw-r--r-- | include/grpc++/impl/sync_no_cxx11.h | 6 | ||||
-rw-r--r-- | include/grpc++/impl/thd_no_cxx11.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/grpc++/impl/sync_no_cxx11.h b/include/grpc++/impl/sync_no_cxx11.h index 5636373b81..dda939bf71 100644 --- a/include/grpc++/impl/sync_no_cxx11.h +++ b/include/grpc++/impl/sync_no_cxx11.h @@ -76,9 +76,9 @@ class lock_guard { template <class mutex> class unique_lock : public lock_guard<mutex> { public: - unique_lock(mutex &mu) : lock_guard(mu) { } - void lock() { lock_internal(); } - void unlock() { unlock_internal(); } + unique_lock(mutex &mu) : lock_guard<mutex>(mu) { } + void lock() { this->lock_internal(); } + void unlock() { this->unlock_internal(); } }; class condition_variable { diff --git a/include/grpc++/impl/thd_no_cxx11.h b/include/grpc++/impl/thd_no_cxx11.h index a01b931df8..a6bdd7dfe9 100644 --- a/include/grpc++/impl/thd_no_cxx11.h +++ b/include/grpc++/impl/thd_no_cxx11.h @@ -82,6 +82,10 @@ class thread { thread_function_base *func_; gpr_thd_id thd_; bool joined_; + + // Disallow copy and assign. + thread(const thread&); + void operator=(const thread&); }; } // namespace grpc |