From 2b1967c72d4ecca0014cd5ff43d9fd5e43473a20 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 22 Dec 2007 15:36:31 +0000
Subject: [PATCH] Merge from trunk.

[SVN r42243]
---
 src/object/function.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/object/function.cpp b/src/object/function.cpp
index 2dad6ab1..64dc3846 100644
--- a/src/object/function.cpp
+++ b/src/object/function.cpp
@@ -565,11 +565,7 @@ BOOST_PYTHON_DECL void add_to_namespace(
 }
 
 
-namespace detail
-/* Cannot be anonymous namespace:
-     http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34094
-     http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34229
- */
+namespace
 {
   struct bind_return
   {
@@ -614,8 +610,7 @@ extern "C"
     function_call(PyObject *func, PyObject *args, PyObject *kw)
     {
         PyObject* result = 0;
-        handle_exception(
-          detail::bind_return(result, static_cast<function*>(func), args, kw));
+        handle_exception(bind_return(result, static_cast<function*>(func), args, kw));
         return result;
     }