1 files changed, 6 insertions, 4 deletions
diff --git a/libstdc++-v3/src/future.cc b/libstdc++-v3/src/future.cc
index d9289487bab..ed3088d87d6 100644
--- a/libstdc++-v3/src/future.cc
+++ b/libstdc++-v3/src/future.cc
@@ -64,12 +64,14 @@ namespace
   }
 }
 
-namespace std
-{
-  const error_category* const future_category = &__future_category_instance();
+_GLIBCXX_BEGIN_NAMESPACE(std)
+
+  const error_category& future_category()
+  { return __future_category_instance(); }
 
   future_error::~future_error() throw() { }
 
   const char* 
   future_error::what() const throw() { return _M_code.message().c_str(); }
-}
+
+_GLIBCXX_END_NAMESPACE