Skip to content

Commit 9338a57

Browse files
committed
fix formatting issues
1 parent 4992203 commit 9338a57

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

libs/libvtrutil/src/tl_optional.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ struct optional_copy_assign_base<T, false> : optional_move_base<T> {
516516
// to make do with a non-trivial move assignment operator even if T is trivially
517517
// move assignable
518518
#ifndef TL_OPTIONAL_GCC49
519-
template<class T, bool = std::is_trivially_destructible<T>::value && std::is_trivially_move_constructible<T>::value && std::is_trivially_move_assignable<T>::value>
519+
template<class T, bool = std::is_trivially_destructible<T>::value&& std::is_trivially_move_constructible<T>::value && std::is_trivially_move_assignable<T>::value>
520520
struct optional_move_assign_base : optional_copy_assign_base<T> {
521521
using optional_copy_assign_base<T>::optional_copy_assign_base;
522522
};
@@ -539,7 +539,7 @@ struct optional_move_assign_base<T, false> : optional_copy_assign_base<T> {
539539

540540
optional_move_assign_base&
541541
operator=(optional_move_assign_base&& rhs) noexcept(
542-
std::is_nothrow_move_constructible<T>::value && std::is_nothrow_move_assignable<T>::value) {
542+
std::is_nothrow_move_constructible<T>::value&& std::is_nothrow_move_assignable<T>::value) {
543543
this->assign(std::move(rhs));
544544
return *this;
545545
}
@@ -1243,7 +1243,7 @@ class optional : private detail::optional_move_assign_base<T>,
12431243
/// If one has a value, it is moved to the other and the movee is left
12441244
/// valueless.
12451245
void
1246-
swap(optional& rhs) noexcept(std::is_nothrow_move_constructible<T>::value && detail::is_nothrow_swappable<T>::value) {
1246+
swap(optional& rhs) noexcept(std::is_nothrow_move_constructible<T>::value&& detail::is_nothrow_swappable<T>::value) {
12471247
using std::swap;
12481248
if (has_value()) {
12491249
if (rhs.has_value()) {

libs/libvtrutil/src/vtr_memory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void free_chunk_memory(t_chunk* chunk_info) {
164164
while (curr_ptr != nullptr) {
165165
/* Must cast pointers to type char*, since the're of type void*, which delete can't
166166
* be called on.*/
167-
delete[] ((char*)curr_ptr->data_vptr); /* Free memory "chunk". */
167+
delete[]((char*)curr_ptr->data_vptr); /* Free memory "chunk". */
168168
prev_ptr = curr_ptr;
169169
curr_ptr = curr_ptr->next;
170170
delete (t_linked_vptr*)prev_ptr; /* Free memory used to track "chunk". */

0 commit comments

Comments
 (0)