Permalink
Browse files

c++17 deletes bind1st,bind2nd,binder1st,binder2nd.

	modified:   src/cl-stl-base.lisp
	modified:   src/cl-stl-functional.lisp
	modified:   src/user-package.lisp
  • Loading branch information...
show-matz committed Jan 22, 2019
1 parent 1f0e349 commit a70e32d9b6a775470fc1cd1783afa51b30d8451d
Showing with 20 additions and 10 deletions.
  1. +4 −4 src/cl-stl-base.lisp
  2. +12 −2 src/cl-stl-functional.lisp
  3. +4 −4 src/user-package.lisp
@@ -238,8 +238,8 @@
:logical_not
:unary_negate ;; deprecated in c++17
:binary_negate ;; deprecated in c++17
:binder1st
:binder2nd
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :binder1st
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :binder2nd
#-cl-stl-0x98 :bit_and
#-cl-stl-0x98 :bit_or
#-cl-stl-0x98 :bit_xor
@@ -255,8 +255,8 @@
#-cl-stl-0x98 :is_placeholder
#-cl-stl-0x98 :is_bind_expression
#-cl-stl-0x98 :bind
:bind1st
:bind2nd
#+(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
@@ -3,8 +3,8 @@

(declaim (inline not1
not2
bind1st
bind2nd
#+(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
@@ -475,6 +475,7 @@
;------------------------------------------------------------
; class binder1st & function bind1st
;------------------------------------------------------------
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-functor binder1st (#-cl-stl-0x98 functor
#+cl-stl-0x98 unary_function)
((op :initform nil
@@ -484,8 +485,10 @@
:initarg :arg
:accessor binder1st-arg)))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(declare-constructor binder1st (2))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-constructor binder1st (op arg1)
#+cl-stl-warn-deprecated
(progn
@@ -498,6 +501,7 @@
:closure (lambda (arg2)
(funcall fnc arg1 arg2)))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defun bind1st (functor arg)
#+cl-stl-warn-deprecated
(progn
@@ -510,6 +514,7 @@
:closure (lambda (arg2)
(funcall fnc arg arg2)))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defmethod operator_clone ((func binder1st))
(let* ((op (clone (binder1st-operator func)))
(arg1 (binder1st-arg func))
@@ -525,6 +530,7 @@
;------------------------------------------------------------
; class binder2nd & function bind2nd
;------------------------------------------------------------
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-functor binder2nd (#-cl-stl-0x98 functor
#+cl-stl-0x98 unary_function)
((op :initform nil
@@ -534,8 +540,10 @@
:initarg :arg
:accessor binder2nd-arg)))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(declare-constructor binder2nd (2))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-constructor binder2nd (op arg2)
#+cl-stl-warn-deprecated
(progn
@@ -548,6 +556,7 @@
:closure (lambda (arg1)
(funcall fnc arg1 arg2)))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defun bind2nd (functor arg)
#+cl-stl-warn-deprecated
(progn
@@ -560,6 +569,7 @@
:closure (lambda (arg1)
(funcall fnc arg1 arg)))))

#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defmethod operator_clone ((func binder2nd))
(let* ((op (clone (binder2nd-operator func)))
(arg2 (binder2nd-arg func))
@@ -235,8 +235,8 @@
:logical_not
:unary_negate ;; deprecated in c++17
:binary_negate ;; deprecated in c++17
:binder1st
:binder2nd
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :binder1st
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :binder2nd
#-cl-stl-0x98 :bit_and
#-cl-stl-0x98 :bit_or
#-cl-stl-0x98 :bit_xor
@@ -252,8 +252,8 @@
#-cl-stl-0x98 :is_placeholder
#-cl-stl-0x98 :is_bind_expression
#-cl-stl-0x98 :bind
:bind1st
:bind2nd
#+(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

0 comments on commit a70e32d

Please sign in to comment.