Skip to content

Commit

Permalink
c++17 deletes bind1st,bind2nd,binder1st,binder2nd.
Browse files Browse the repository at this point in the history 
	modified:   src/cl-stl-base.lisp
	modified:   src/cl-stl-functional.lisp
	modified:   src/user-package.lisp
  • Loading branch information
Show MATSUOKA committed Jan 22, 2019
1 parent 1f0e349 commit a70e32d
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
8 changes: 4 additions & 4 deletions src/cl-stl-base.lisp
View file
Expand Up @@ -238,8 +238,8 @@
:logical_not :logical_not
:unary_negate ;; deprecated in c++17 :unary_negate ;; deprecated in c++17
:binary_negate ;; deprecated in c++17 :binary_negate ;; deprecated in c++17
:binder1st #+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :binder1st
:binder2nd #+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :binder2nd
#-cl-stl-0x98 :bit_and #-cl-stl-0x98 :bit_and
#-cl-stl-0x98 :bit_or #-cl-stl-0x98 :bit_or
#-cl-stl-0x98 :bit_xor #-cl-stl-0x98 :bit_xor
Expand All @@ -255,8 +255,8 @@
#-cl-stl-0x98 :is_placeholder #-cl-stl-0x98 :is_placeholder
#-cl-stl-0x98 :is_bind_expression #-cl-stl-0x98 :is_bind_expression
#-cl-stl-0x98 :bind #-cl-stl-0x98 :bind
:bind1st #+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :bind1st
:bind2nd #+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :bind2nd
:ptr_fun1 :ptr_fun1
:ptr_fun2 :ptr_fun2
:mem_fun :mem_fun
Expand Down
14 changes: 12 additions & 2 deletions src/cl-stl-functional.lisp
View file
Expand Up @@ -3,8 +3,8 @@


(declaim (inline not1 (declaim (inline not1
not2 not2
bind1st #+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) bind1st
bind2nd #+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) bind2nd
ptr_fun1 ptr_fun1
ptr_fun2 ptr_fun2
mem_fun mem_fun
Expand Down Expand Up @@ -475,6 +475,7 @@
;------------------------------------------------------------ ;------------------------------------------------------------
; class binder1st & function bind1st ; class binder1st & function bind1st
;------------------------------------------------------------ ;------------------------------------------------------------
#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(define-functor binder1st (#-cl-stl-0x98 functor (define-functor binder1st (#-cl-stl-0x98 functor
#+cl-stl-0x98 unary_function) #+cl-stl-0x98 unary_function)
((op :initform nil ((op :initform nil
Expand All @@ -484,8 +485,10 @@
:initarg :arg :initarg :arg
:accessor binder1st-arg))) :accessor binder1st-arg)))


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


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


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


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


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


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


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


#+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
(defmethod operator_clone ((func binder2nd)) (defmethod operator_clone ((func binder2nd))
(let* ((op (clone (binder2nd-operator func))) (let* ((op (clone (binder2nd-operator func)))
(arg2 (binder2nd-arg func)) (arg2 (binder2nd-arg func))
Expand Down
8 changes: 4 additions & 4 deletions src/user-package.lisp
View file
Expand Up @@ -235,8 +235,8 @@
:logical_not :logical_not
:unary_negate ;; deprecated in c++17 :unary_negate ;; deprecated in c++17
:binary_negate ;; deprecated in c++17 :binary_negate ;; deprecated in c++17
:binder1st #+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :binder1st
:binder2nd #+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :binder2nd
#-cl-stl-0x98 :bit_and #-cl-stl-0x98 :bit_and
#-cl-stl-0x98 :bit_or #-cl-stl-0x98 :bit_or
#-cl-stl-0x98 :bit_xor #-cl-stl-0x98 :bit_xor
Expand All @@ -252,8 +252,8 @@
#-cl-stl-0x98 :is_placeholder #-cl-stl-0x98 :is_placeholder
#-cl-stl-0x98 :is_bind_expression #-cl-stl-0x98 :is_bind_expression
#-cl-stl-0x98 :bind #-cl-stl-0x98 :bind
:bind1st #+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :bind1st
:bind2nd #+(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14) :bind2nd
:ptr_fun1 :ptr_fun1
:ptr_fun2 :ptr_fun2
:mem_fun :mem_fun
Expand Down

0 comments on commit a70e32d

Please sign in to comment.