c++17 deprecates not1,not2,unary_negate,binary_negate.

modified: src/cl-stl-base.lisp modified: src/cl-stl-functional.lisp modified: src/user-package.lisp
show-matz · Jan 16, 2019 · 1f0e3495fbe76d2bc375ad12b53ee711e1630dfd · 1f0e349
1 parent 232991a
commit 1f0e3495fbe76d2bc375ad12b53ee711e1630dfd
Unified Split

Showing with 24 additions and 8 deletions.

+4 −4 src/cl-stl-base.lisp

+16 −0 src/cl-stl-functional.lisp

+4 −4 src/user-package.lisp
diff --git a/src/cl-stl-base.lisp b/src/cl-stl-base.lisp
@@ -236,8 +236,8 @@
 				:logical_and
 				:logical_or
 				:logical_not
-  
-				:unary_negate
-  
-				:binary_negate
+  
+				:unary_negate	;; deprecated in c++17
+  
+				:binary_negate	;; deprecated in c++17
 				:binder1st
 				:binder2nd
  #-cl-stl-0x98 :bit_and
@@ -250,8 +250,8 @@
  #-cl-stl-0x98 :function
  #-cl-stl-0x98 :target
 				;utility functions
-  
-				:not1
-  
-				:not2
+  
+				:not1			;; deprecated in c++17
+  
+				:not2			;; deprecated in c++17
  #-cl-stl-0x98 :is_placeholder
  #-cl-stl-0x98 :is_bind_expression
  #-cl-stl-0x98 :bind

diff --git a/src/cl-stl-functional.lisp b/src/cl-stl-functional.lisp
@@ -387,6 +387,10 @@
 (declare-constructor unary_negate (1))
 (define-constructor unary_negate (op)
+  
+  #+cl-stl-warn-deprecated
+  
+  (progn
+  
+	#-(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
+  
+	(warn "unary_negate is deprecated."))
  (let* ((op  (clone op))
 		 (fnc (functor_function op)))
 	(make-instance 'unary_negate
@@ -395,6 +399,10 @@
 							  (not (funcall fnc arg))))))
 (defun not1 (op)
+  
+  #+cl-stl-warn-deprecated
+  
+  (progn
+  
+	#-(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
+  
+	(warn "not1 is deprecated."))
  (let* ((op  (clone op))
 		 (fnc (functor_function op)))
 	(make-instance 'unary_negate
@@ -424,6 +432,10 @@
 (declare-constructor binary_negate (1))
 (define-constructor binary_negate (op)
+  
+  #+cl-stl-warn-deprecated
+  
+  (progn
+  
+	#-(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
+  
+	(warn "binary_negate is deprecated."))
  (let* ((op  (clone op))
 		 (fnc (functor_function op)))
 	(make-instance 'binary_negate
@@ -432,6 +444,10 @@
 							  (not (funcall fnc arg1 arg2))))))
 (defun not2 (op)
+  
+  #+cl-stl-warn-deprecated
+  
+  (progn
+  
+	#-(or cl-stl-0x98 cl-stl-0x11 cl-stl-0x14)
+  
+	(warn "not2 is deprecated."))
  (let* ((op  (clone op))
 		 (fnc (functor_function op)))
 	(make-instance 'binary_negate

diff --git a/src/user-package.lisp b/src/user-package.lisp
@@ -233,8 +233,8 @@
 				:logical_and
 				:logical_or
 				:logical_not
-  
-				:unary_negate
-  
-				:binary_negate
+  
+				:unary_negate	;; deprecated in c++17
+  
+				:binary_negate	;; deprecated in c++17
 				:binder1st
 				:binder2nd
  #-cl-stl-0x98 :bit_and
@@ -247,8 +247,8 @@
 ; #-cl-stl-0x98 :function                        ; shadowed
  #-cl-stl-0x98 :target
 				;utility functions
-  
-				:not1
-  
-				:not2
+  
+				:not1			;; deprecated in c++17
+  
+				:not2			;; deprecated in c++17
  #-cl-stl-0x98 :is_placeholder
  #-cl-stl-0x98 :is_bind_expression
  #-cl-stl-0x98 :bind