From 9fac184765c3756de6b22cf110a6fc3f626d2fe1 Mon Sep 17 00:00:00 2001
From: Jeffrey Armstrong <jeff@approximatrix.com>
Date: Thu, 29 Oct 2020 12:36:45 -0400
Subject: Added handling of callbacks in a Fortran-esque manner

---
 src/clp.f90 | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'src/clp.f90')

diff --git a/src/clp.f90 b/src/clp.f90
index 2c8692a..cd34b95 100644
--- a/src/clp.f90
+++ b/src/clp.f90
@@ -1,5 +1,7 @@
 module clp
     use iso_c_binding
+    use clp_callback, only: fortran_cb
+    use clp_constants
     implicit none
     
         interface
@@ -498,10 +500,10 @@ module clp
                 use iso_c_binding
                     type(c_ptr) :: model
             end subroutine
-            subroutine Clp_registerCallBack(model,userCallBack) bind(C,name="Clp_registerCallBack")
+            subroutine Clp_registerCallBack_C(model,userCallBack) bind(C,name="Clp_registerCallBack")
                 use iso_c_binding
                     type(c_ptr), value :: model
-                    type(c_ptr), value :: userCallBack
+                    type(c_funptr), value :: userCallBack
             end subroutine
             subroutine Clp_clearCallBack(model) bind(C,name="Clp_clearCallBack")
                 use iso_c_binding
@@ -1700,4 +1702,23 @@ contains
         
     end subroutine Clp_integerInformation
 
+    subroutine Clp_registerCallback(model, cb)
+    use iso_c_binding
+    use clp_callback
+    implicit none
+    
+        type(c_ptr) :: model
+        procedure(fortran_cb) :: cb
+        
+        if(associated(current_callback)) then
+            Write(*,*) "*** WARNING: Clp Fortran Library supports only a single callback"
+            Write(*,*) "***          Reassigning current callback"
+        end if 
+        
+        current_callback => cb
+        
+        call Clp_Registercallback_C(model, c_funloc(Clp_boundCallbackInterface))
+        
+    end subroutine Clp_registerCallback
+
 end module clp
-- 
cgit v1.2.3