From b4eb17db6591ec6a6cd875c94bd66fe972630b9a Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 19 Mar 2020 14:53:56 -0400
Subject: [PATCH] Ensure LLTimer is trivially copyable
---
indra/llcommon/lltimer.cpp | 3 ---
indra/llcommon/lltimer.h | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index 76e892212a7..f99636a0c58 100644
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -282,9 +282,6 @@ LLTimer::LLTimer()
reset();
}
-LLTimer::~LLTimer()
-{}
-
// static
void LLTimer::initClass()
{
diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h
index ec70213447c..e7924db01b3 100644
--- a/indra/llcommon/lltimer.h
+++ b/indra/llcommon/lltimer.h
@@ -60,7 +60,7 @@ class LL_COMMON_API LLTimer
public:
LLTimer();
- ~LLTimer();
+ ~LLTimer() = default;
static void initClass();
static void cleanupClass();
--
GitLab