Add support for std::ptr_fun

Change-Id: I89f178d7adbd87b503077d75cec021ee94f96a48
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13998
Tested-by: Jenkins Server
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 137 insertions, 12 deletions

diff --git a/src/include/functional b/src/include/functional
index 9f7178c47..ddefe2bf9 100644
--- a/src/include/functional
+++ b/src/include/functional
@@ -1,11 +1,13 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/include/functional $                                      */
+/* $Source: src/include/functional.C $                                    */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2014              */
+/* Contributors Listed Below - COPYRIGHT 2011,2014                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -73,6 +75,40 @@ namespace std
             { return x > y; }
     };
 
+// --------------- ptr_fun templates --------------- //
+    template<typename A1, typename Result>
+        struct pointer_to_unary_function : public unary_function<A1, Result>
+    {
+        explicit pointer_to_unary_function(Result (*f)(A1)) : func(f) {}
+        Result operator()(A1 a1) const { return (*func)(a1); }
+
+        protected:
+            Result (*func)(A1);
+    };
+
+    template <typename A1, typename Result>
+        pointer_to_unary_function<A1, Result> ptr_fun(Result (*f)(A1))
+    {
+        return pointer_to_unary_function<A1, Result>(f);
+    }
+
+    template<typename A1, typename A2, typename Result>
+        struct pointer_to_binary_function :
+            public binary_function<A1, A2, Result>
+    {
+        explicit pointer_to_binary_function(Result (*f)(A1, A2)) : func(f) {}
+        Result operator()(A1 a1, A2 a2) const { return (*func)(a1,a2); }
+
+        protected:
+            Result (*func)(A1,A2);
+    };
+
+    template <typename A1, typename A2, typename Result>
+        pointer_to_binary_function<A1, A2, Result> ptr_fun(Result (*f)(A1,A2))
+    {
+        return pointer_to_binary_function<A1, A2, Result>(f);
+    }
+
 // --------------- mem_fun templates --------------- //
 
     template<typename Result, typename X>
@@ -81,7 +117,7 @@ namespace std
         explicit mem_fun_t(Result (X::*f)()) : func(f) {}
         Result operator()(X* x) const { return (x->*func)(); }
 
-        private:
+        protected:
             Result (X::*func)();
     };
 
@@ -91,7 +127,7 @@ namespace std
         explicit const_mem_fun_t(Result (X::*f)() const) : func(f) {}
         Result operator()(const X* x) const { return (x->*func)(); }
 
-        private:
+        protected:
             Result (X::*func)() const;
     };
         
@@ -115,7 +151,7 @@ namespace std
         explicit mem_fun1_t(Result (X::*f)(Arg)) : func(f) {}
         Result operator()(X* x, Arg a) const { return (x->*func)(a); }
 
-        private:
+        protected:
             Result (X::*func)(Arg);
     };
 
@@ -125,7 +161,7 @@ namespace std
         explicit const_mem_fun1_t(Result (X::*f)(Arg) const) : func(f) {}
         Result operator()(const X* x, Arg a) const { return (x->*func)(a); }
 
-        private:
+        protected:
             Result (X::*func)(Arg) const;
     };
 
@@ -149,7 +185,7 @@ namespace std
         explicit mem_fun_ref_t(Result (X::*f)()) : func(f) {}
         Result operator()(X& x) const { return (x.*func)(); }
 
-        private:
+        protected:
             Result (X::*func)();
     };
 
@@ -159,7 +195,7 @@ namespace std
         explicit const_mem_fun_ref_t(Result (X::*f)() const) : func(f) {}
         Result operator()(const X& x) const { return (x.*func)(); }
 
-        private:
+        protected:
             Result (X::*func)() const;
     };
         
@@ -183,7 +219,7 @@ namespace std
         explicit mem_fun1_ref_t(Result (X::*f)(Arg)) : func(f) {}
         Result operator()(X& x, Arg a) const { return (x.*func)(a); }
 
-        private:
+        protected:
             Result (X::*func)(Arg);
     };
 
@@ -193,7 +229,7 @@ namespace std
         explicit const_mem_fun1_ref_t(Result (X::*f)(Arg) const) : func(f) {}
         Result operator()(const X& x, Arg a) const { return (x.*func)(a); }
 
-        private:
+        protected:
             Result (X::*func)(Arg) const;
     };
 
@@ -229,7 +265,7 @@ namespace std
             return func(arg, x);
         }
 
-        private:
+        protected:
             AdaptableBinaryFunction func;
             typename AdaptableBinaryFunction::first_argument_type arg;
     };
@@ -263,7 +299,7 @@ namespace std
             return func(x, arg);
         }
 
-        private:
+        protected:
             AdaptableBinaryFunction func;
             typename AdaptableBinaryFunction::second_argument_type arg;
     };
diff --git a/src/usr/testcore/lib/stl_functional.H b/src/usr/testcore/lib/stl_functional.H
new file mode 100644
index 000000000..5aac940f0
--- /dev/null
+++ b/src/usr/testcore/lib/stl_functional.H
@@ -0,0 +1,89 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/testcore/lib/stl_functional.H $                       */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+#ifndef __LIB_STL_FUNCTIONAL_H
+#define __LIB_STL_FUNCTIONAL_H
+
+#include <cxxtest/TestSuite.H>
+#include <functional>
+#include <vector>
+
+static bool STLFunctionalTest__matches1(int i)
+{
+    return i == 1;
+}
+
+static bool STLFunctionalTest__matches(int n, int m)
+{
+    return n == m;
+}
+
+class STLFunctionalTest : public CxxTest::TestSuite
+{
+    public:
+        void testUnaryPtrFun()
+        {
+            using std::ptr_fun;
+
+            if (!ptr_fun(&STLFunctionalTest__matches1)(1))
+            {
+                TS_FAIL("__matches1(1) is false.");
+            }
+
+            if (ptr_fun(&STLFunctionalTest__matches1)(100))
+            {
+                TS_FAIL("__matches1(100) is true.");
+            }
+        }
+
+        void testBinaryPtrFun()
+        {
+            using std::ptr_fun;
+            using std::vector;
+
+            vector<int> v;
+
+            for(int i = 0; i < 10; i++)
+            {
+                v.push_back(i);
+            }
+
+            for(int i = 0; i < 10; i++)
+            {
+                if (*find_if(v.begin(), v.end(),
+                        bind1st(ptr_fun(&STLFunctionalTest__matches), i)) != i)
+                {
+                    TS_FAIL("find_if with bind1st of %d doesn't match.", i);
+                }
+
+                if (*find_if(v.begin(), v.end(),
+                        bind2nd(ptr_fun(&STLFunctionalTest__matches), i)) != i)
+                {
+                    TS_FAIL("find_if with bind2nd of %d doesn't match.", i);
+                }
+            }
+        }
+};
+
+#endif