git: inherit current upstream when creating a new branch

[dotfiles.git] / vim / ultisnips / cpp.snippets

diff --git a/vim/ultisnips/cpp.snippets b/vim/ultisnips/cpp.snippets
index 5ffbe5159c9c4f225020395d233552274bb7ef08..a677d5f5f5c98c7be4c0118321fc1af81ddc9e04 100644 (file)
--- a/vim/ultisnips/cpp.snippets
+++ b/vim/ultisnips/cpp.snippets
@@ -2,7 +2,9 @@
 priority 1
 
 # disable horrible one word snippets
-clearsnippets pri pro pub fr mu t
+clearsnippets pri pro pub fr mu t pr
+
+clearsnippets set
 
 snippet inc "#include <>" b
 #include <${1:iostream}>
@@ -28,9 +30,13 @@ snippet rule5 "Default constructors/destructors/operaters" b
 ${1:classname}() = default;
 ~$1() = default;
 $1($1 const &) = default;
-$1($1 &&) = default;
+$1($1 &&) noexcept = default;
 $1 &operator=($1 const &) = default;
-$1 &operator=($1 &&) = default;
+$1 &operator=($1 &&) noexcept = default;
+endsnippet
+
+snippet spaceship "defaulted spaceship operator <=>"
+friend auto operator<=>(${1:type} const&, $1 const&) = default;
 endsnippet
 
 snippet ns "namespace .. (namespace)"
@@ -163,7 +169,7 @@ ${VISUAL}${0}
 endsnippet
 
 snippet FPP "FPP Copyright" b
-// Copyright © Focal Point Positioning Limited 2020. All Rights Reserved.
+// Copyright © Focal Point Positioning Limited `!v strftime("%Y")`. All Rights Reserved.
 // This code is the copyright of Focal Point Positioning Limited and
 // cannot be used, copied or distributed without the express written
 // permission of Focal Point Positioning Limited.