Skip to content
Snippets Groups Projects
Commit b4260dd4 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Various small cleanups

parent 407e65a0
No related branches found
No related tags found
No related merge requests found
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
*/ */
#include <map> #include <map>
#include <vector>
class LLCallStackImpl; class LLCallStackImpl;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* $/LicenseInfo$ * $/LicenseInfo$
*/ */
#include "llwin32headers.h" #include "llwin32headerslean.h"
// Precompiled header // Precompiled header
#include "linden_common.h" #include "linden_common.h"
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include "stdtypes.h" #include "stdtypes.h"
#include "llpreprocessor.h" #include "llpreprocessor.h"
#include <boost/static_assert.hpp>
const int LL_ERR_NOERR = 0; const int LL_ERR_NOERR = 0;
...@@ -86,13 +85,8 @@ const int LL_ERR_NOERR = 0; ...@@ -86,13 +85,8 @@ const int LL_ERR_NOERR = 0;
#define llverify(func) do {if (func) {}} while(0) #define llverify(func) do {if (func) {}} while(0)
#endif #endif
#ifdef LL_WINDOWS
#define LL_STATIC_ASSERT(func, msg) static_assert(func, msg) #define LL_STATIC_ASSERT(func, msg) static_assert(func, msg)
#define LL_BAD_TEMPLATE_INSTANTIATION(type, msg) static_assert(false, 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 /** Error Logging Facility
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <ctype.h> #include <ctype.h>
#ifdef WIN32 #ifdef WIN32
#include "llwin32headers.h" #include "llwin32headerslean.h"
#include <winnt.h> #include <winnt.h>
#endif #endif
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "llapp.h" #include "llapp.h"
#include "llapr.h" #include "llapr.h"
#include "boost/intrusive_ptr.hpp"
#include "llrefcount.h" #include "llrefcount.h"
#include <thread> #include <thread>
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
* $/LicenseInfo$ * $/LicenseInfo$
*/ */
#pragma once
#if LL_WINDOWS #if LL_WINDOWS
#pragma warning (push) #pragma warning (push)
#pragma warning (disable:4265) #pragma warning (disable:4265)
......
...@@ -26,14 +26,7 @@ ...@@ -26,14 +26,7 @@
#ifndef LL_LLINTERP_H #ifndef LL_LLINTERP_H
#define LL_LLINTERP_H #define LL_LLINTERP_H
#if defined(LL_WINDOWS) #include <cmath>
// 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"
// Class from which different types of interpolators can be derived // Class from which different types of interpolators can be derived
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment