Permalink
Browse files

c++17 deletes ptr_fun, mem_fun etc.

	modified:   src/cl-stl-base.lisp
	modified:   src/cl-stl-functional.lisp
	modified:   src/user-package.lisp
  • Loading branch information...
show-matz committed Feb 12, 2019
1 parent a70e32d commit f8090009392f01a8a328c0905a08019d8b7660c6
Showing with 48 additions and 26 deletions.
  1. +10 −10 src/cl-stl-base.lisp
  2. +28 −6 src/cl-stl-functional.lisp
  3. +10 −10 src/user-package.lisp
@@ -243,10 +243,10 @@
#-cl-stl-0x98 :bit_and
#-cl-stl-0x98 :bit_or
#-cl-stl-0x98 :bit_xor
:pointer_to_unary_function
:pointer_to_binary_function
:mem_fun_t
:mem_fun1_t
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :pointer_to_unary_function
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :pointer_to_binary_function
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :mem_fun_t
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :mem_fun1_t
#-cl-stl-0x98 :function
#-cl-stl-0x98 :target
;utility functions
@@ -257,12 +257,12 @@
#-cl-stl-0x98 :bind
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :bind1st
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :bind2nd
:ptr_fun1
:ptr_fun2
:mem_fun
:mem_fun1
:mem_fun_ref
:mem_fun1_ref
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :ptr_fun1
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :ptr_fun2
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :mem_fun
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :mem_fun1
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :mem_fun_ref
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :mem_fun1_ref
#-cl-stl-0x98 :mem_fn
#-(or
cl-stl-0x98
@@ -5,12 +5,12 @@
not2
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) bind1st
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) bind2nd
ptr_fun1
ptr_fun2
mem_fun
mem_fun_ref
mem_fun1
mem_fun1_ref
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) ptr_fun1
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) ptr_fun2
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) mem_fun
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) mem_fun_ref
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) mem_fun1
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) mem_fun1_ref
#-cl-stl-0x98 is_placeholder
#-cl-stl-0x98 is_bind_expression
#-cl-stl-0x98 target))
@@ -592,15 +592,18 @@
; class pointer_to_unary_function & function ptr_fun1
; ( NONSENSE in CL-STL )
;------------------------------------------------------------
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-functor pointer_to_unary_function (#-cl-stl-0x98 functor
#+cl-stl-0x98 unary_function)
((op :type cl:function
:initform nil
:initarg :operator
:accessor pointer_to_unary_function-operator)))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(declare-constructor pointer_to_unary_function (1))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-constructor pointer_to_unary_function (func)
#+cl-stl-warn-deprecated
(progn
@@ -610,6 +613,7 @@
:closure (lambda (arg)
(funcall func arg))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defun ptr_fun1 (func)
#+cl-stl-warn-deprecated
(progn
@@ -619,6 +623,7 @@
:closure (lambda (arg)
(funcall func arg))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defmethod operator_clone ((func pointer_to_unary_function))
(let ((func (pointer_to_unary_function-operator func)))
(make-instance 'pointer_to_unary_function
@@ -632,15 +637,18 @@
; class pointer_to_binary_function & function ptr_fun2
; ( NONSENSE in CL-STL )
;------------------------------------------------------------
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-functor pointer_to_binary_function (#-cl-stl-0x98 functor
#+cl-stl-0x98 binary_function)
((op :type cl:function
:initform nil
:initarg :operator
:accessor pointer_to_binary_function-operator)))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(declare-constructor pointer_to_binary_function (1))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-constructor pointer_to_binary_function (func)
#+cl-stl-warn-deprecated
(progn
@@ -650,6 +658,7 @@
:closure (lambda (arg1 arg2)
(funcall func arg1 arg2))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defun ptr_fun2 (func)
#+cl-stl-warn-deprecated
(progn
@@ -659,6 +668,7 @@
:closure (lambda (arg1 arg2)
(funcall func arg1 arg2))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defmethod operator_clone ((func pointer_to_binary_function))
(let ((func (pointer_to_binary_function-operator func)))
(make-instance 'pointer_to_binary_function
@@ -679,15 +689,18 @@
; class mem_fun_t & function mem_fun etc.
; ( NONSENSE in CL-STL )
;------------------------------------------------------------
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-functor mem_fun_t (#-cl-stl-0x98 functor
#+cl-stl-0x98 unary_function)
((op :type cl:function
:initform nil
:initarg :operator
:accessor mem_fun_t-operator)))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(declare-constructor mem_fun_t (1))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-constructor mem_fun_t (func)
#+cl-stl-warn-deprecated
(progn
@@ -697,6 +710,7 @@
:closure (lambda (obj)
(funcall func obj))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defun mem_fun (func)
#+cl-stl-warn-deprecated
(progn
@@ -706,6 +720,7 @@
:closure (lambda (obj)
(funcall func obj))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defun mem_fun_ref (func)
#+cl-stl-warn-deprecated
(progn
@@ -715,6 +730,7 @@
:closure (lambda (obj)
(funcall func obj))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defmethod operator_clone ((func mem_fun_t))
(let ((func (mem_fun_t-operator func)))
(make-instance 'mem_fun_t
@@ -729,15 +745,18 @@
; class mem_fun1_t & function mem_fun1 etc.
; ( NONSENSE in CL-STL )
;------------------------------------------------------------
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-functor mem_fun1_t (#-cl-stl-0x98 functor
#+cl-stl-0x98 unary_function)
((op :type cl:function
:initform nil
:initarg :operator
:accessor mem_fun1_t-operator)))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(declare-constructor mem_fun1_t (1))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-constructor mem_fun1_t (func)
#+cl-stl-warn-deprecated
(progn
@@ -747,6 +766,7 @@
:closure (lambda (obj arg)
(funcall func obj arg))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defun mem_fun1 (func)
#+cl-stl-warn-deprecated
(progn
@@ -756,6 +776,7 @@
:closure (lambda (obj arg)
(funcall func obj arg))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defun mem_fun1_ref (func)
#+cl-stl-warn-deprecated
(progn
@@ -765,6 +786,7 @@
:closure (lambda (obj arg)
(funcall func obj arg))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defmethod operator_clone ((func mem_fun1_t))
(let ((func (mem_fun1_t-operator func)))
(make-instance 'mem_fun1_t
@@ -240,10 +240,10 @@
#-cl-stl-0x98 :bit_and
#-cl-stl-0x98 :bit_or
#-cl-stl-0x98 :bit_xor
:pointer_to_unary_function
:pointer_to_binary_function
:mem_fun_t
:mem_fun1_t
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :pointer_to_unary_function
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :pointer_to_binary_function
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :mem_fun_t
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :mem_fun1_t
; #-cl-stl-0x98 :function ; shadowed
#-cl-stl-0x98 :target
;utility functions
@@ -254,12 +254,12 @@
#-cl-stl-0x98 :bind
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :bind1st
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :bind2nd
:ptr_fun1
:ptr_fun2
:mem_fun
:mem_fun1
:mem_fun_ref
:mem_fun1_ref
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :ptr_fun1
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :ptr_fun2
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :mem_fun
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :mem_fun1
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :mem_fun_ref
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :mem_fun1_ref
#-cl-stl-0x98 :mem_fn
#-(or
cl-stl-0x98

0 comments on commit f809000

Please sign in to comment.