From b4260dd4794ca5b06b477037a44a195e7665e8d1 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 20 Oct 2020 02:04:50 -0400
Subject: [PATCH] Various small cleanups
---
indra/llcommon/llcallstack.h | 1 +
indra/llcommon/llcoros.cpp | 2 +-
indra/llcommon/llerror.h | 6 ------
indra/llcommon/llfindlocale.cpp | 2 +-
indra/llcommon/llthread.h | 1 -
indra/llcommon/mutex.h | 2 ++
indra/llmath/llinterp.h | 9 +--------
7 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/indra/llcommon/llcallstack.h b/indra/llcommon/llcallstack.h
index 663b77eb991..799208e77a2 100644
--- a/indra/llcommon/llcallstack.h
+++ b/indra/llcommon/llcallstack.h
@@ -25,6 +25,7 @@
*/
#include <map>
+#include <vector>
class LLCallStackImpl;
diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp
index eeca71e1af8..5ba688c8649 100644
--- a/indra/llcommon/llcoros.cpp
+++ b/indra/llcommon/llcoros.cpp
@@ -26,7 +26,7 @@
* $/LicenseInfo$
*/
-#include "llwin32headers.h"
+#include "llwin32headerslean.h"
// Precompiled header
#include "linden_common.h"
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index 6ae95c9c01c..385fdaadac2 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -34,7 +34,6 @@
#include "stdtypes.h"
#include "llpreprocessor.h"
-#include <boost/static_assert.hpp>
const int LL_ERR_NOERR = 0;
@@ -86,13 +85,8 @@ const int LL_ERR_NOERR = 0;
#define llverify(func) do {if (func) {}} while(0)
#endif
-#ifdef LL_WINDOWS
#define LL_STATIC_ASSERT(func, msg) static_assert(func, msg)
#define LL_BAD_TEMPLATE_INSTANTIATION(type, msg) static_assert(false, msg)
-#else
-#define LL_STATIC_ASSERT(func, msg) BOOST_STATIC_ASSERT(func)
-#define LL_BAD_TEMPLATE_INSTANTIATION(type, msg) BOOST_STATIC_ASSERT(sizeof(type) != 0 && false);
-#endif
/** Error Logging Facility
diff --git a/indra/llcommon/llfindlocale.cpp b/indra/llcommon/llfindlocale.cpp
index 6aaa57f498a..493a72493bb 100644
--- a/indra/llcommon/llfindlocale.cpp
+++ b/indra/llcommon/llfindlocale.cpp
@@ -33,7 +33,7 @@
#include <ctype.h>
#ifdef WIN32
-#include "llwin32headers.h"
+#include "llwin32headerslean.h"
#include <winnt.h>
#endif
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index ebd13226fd8..5db13db41ab 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -29,7 +29,6 @@
#include "llapp.h"
#include "llapr.h"
-#include "boost/intrusive_ptr.hpp"
#include "llrefcount.h"
#include <thread>
diff --git a/indra/llcommon/mutex.h b/indra/llcommon/mutex.h
index 90d0942270a..6c8e24ade75 100644
--- a/indra/llcommon/mutex.h
+++ b/indra/llcommon/mutex.h
@@ -9,6 +9,8 @@
* $/LicenseInfo$
*/
+#pragma once
+
#if LL_WINDOWS
#pragma warning (push)
#pragma warning (disable:4265)
diff --git a/indra/llmath/llinterp.h b/indra/llmath/llinterp.h
index b2167b3486f..31a5bbaa4c2 100644
--- a/indra/llmath/llinterp.h
+++ b/indra/llmath/llinterp.h
@@ -26,14 +26,7 @@
#ifndef LL_LLINTERP_H
#define LL_LLINTERP_H
-#if defined(LL_WINDOWS)
-// macro definitions for common math constants (e.g. M_PI) are declared under the _USE_MATH_DEFINES
-// on Windows system.
-// So, let's define _USE_MATH_DEFINES before including math.h
- #define _USE_MATH_DEFINES
-#endif
-
-#include "math.h"
+#include <cmath>
// Class from which different types of interpolators can be derived
--
GitLab