diff --git a/include/boost/thread/future.hpp b/include/boost/thread/future.hpp
index f4b3fb96..55afca8f 100644
--- a/include/boost/thread/future.hpp
+++ b/include/boost/thread/future.hpp
@@ -18,11 +18,11 @@
 #ifdef BOOST_NO_EXCEPTIONS
 namespace boost
 {
-
+namespace detail {
 struct shared_state_base {
-    void notify_deferred();
+    void notify_deferred() {}
 };
-
+}
 }
 #else
 
diff --git a/src/future.cpp b/src/future.cpp
index 35b8853f..a477e709 100644
--- a/src/future.cpp
+++ b/src/future.cpp
@@ -5,14 +5,7 @@
 
 #include <boost/thread/detail/config.hpp>
 
-#ifdef BOOST_NO_EXCEPTIONS
-namespace boost
-{
-    void shared_state_base::notify_deferred() {}
-}
-
-#else
-
+#ifndef BOOST_NO_EXCEPTIONS
 
 #include <boost/thread/futures/future_error_code.hpp>
 #include <string>
diff --git a/src/pthread/thread.cpp b/src/pthread/thread.cpp
index bb3d9a17..f8fc44a1 100644
--- a/src/pthread/thread.cpp
+++ b/src/pthread/thread.cpp
@@ -478,7 +478,7 @@ namespace boost
             mutex mx;
             unique_lock<mutex> lock(mx);
             condition_variable cond;
-            cond.do_wait_until(lock, detail::internal_platform_clock::now())
+            cond.do_wait_until(lock, detail::internal_platform_clock::now());
 #   endif
         }
     }