From b35f4b88f54176c819e95c131e4186a43e72a40f Mon Sep 17 00:00:00 2001
From: Gabriel Hare <ghare@leapmotion.com>
Date: Thu, 7 Aug 2014 20:43:14 -0700
Subject: [PATCH] Making implicit templates types discoverable.

---
 autowiring/atomic_object.h | 6 ++++--
 autowiring/unlock_object.h | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/autowiring/atomic_object.h b/autowiring/atomic_object.h
index b72c88268..3216aa54b 100644
--- a/autowiring/atomic_object.h
+++ b/autowiring/atomic_object.h
@@ -14,10 +14,12 @@ template<class object, class lock> class unlock_object;
 ///   or to modify the contents of atomic_object.
 /// - Held locks, via child classes that manipulate the protected lock member.
 ///</remarks>
-template<class object, class lock = std::mutex>
+template<class object_type, class lock_type = std::mutex>
 class atomic_object {
 public:
-  friend class unlock_object<object, lock>;
+  friend class unlock_object<object_type, lock_type>;
+  typedef object_type object;
+  typedef lock_type lock;
   typedef unlock_object<object, lock> unlock;
   typedef std::shared_ptr<atomic_object<object, lock>> shared;
 
diff --git a/autowiring/unlock_object.h b/autowiring/unlock_object.h
index a54029d2e..459ec891b 100644
--- a/autowiring/unlock_object.h
+++ b/autowiring/unlock_object.h
@@ -10,10 +10,12 @@ template<class object, class lock> class atomic_object;
 ///An unlock_object cannot be copied by construction or assignment since it maintains access.
 ///An unlock_object cannot be used to extend the existence of an atomic_object.
 ///</remarks>
-template<class object, class lock = std::mutex>
+template<class object_type, class lock_type = std::mutex>
 class unlock_object {
 public:
-  typedef atomic_object<object, lock> atomic;
+  typedef object_type object;
+  typedef atomic_object<object_type, lock_type> atomic;
+  typedef typename atomic::lock lock;
   typedef typename atomic::shared shared;
 
   unlock_object(const unlock_object<object, lock>& source) = delete;