1 files changed, 6 insertions, 4 deletions
diff --git a/boost/bimap/detail/modifier_adaptor.hpp b/boost/bimap/detail/modifier_adaptor.hpp
index f0de120806..c1ee3670ce 100644
--- a/boost/bimap/detail/modifier_adaptor.hpp
+++ b/boost/bimap/detail/modifier_adaptor.hpp
@@ -18,8 +18,6 @@
 
 #include <boost/config.hpp>
 
-#include <functional>
-
 namespace boost {
 namespace bimaps {
 namespace detail {
@@ -34,11 +32,13 @@ template
     class SecondExtractor 
 >
 struct relation_modifier_adaptor :
-    public std::unary_function<NewArgument,bool>,
     Modifier,
     FirstExtractor,
     SecondExtractor
 {
+    typedef NewArgument argument_type;
+    typedef void result_type;
+
     relation_modifier_adaptor( const Modifier & m ) : Modifier(m) {}
     relation_modifier_adaptor( const Modifier & m,
                                const FirstExtractor & fe,
@@ -65,10 +65,12 @@ template
     class Extractor
 >
 struct unary_modifier_adaptor :
-    public std::unary_function<NewArgument,bool>,
     Modifier,
     Extractor
 {
+    typedef NewArgument argument_type;
+    typedef void result_type;
+
     unary_modifier_adaptor( const Modifier & m ) : Modifier(m) {}
     unary_modifier_adaptor( const Modifier & m,
                             const Extractor & fe) :