55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
diff --git a/configurecompiler.cmake b/configurecompiler.cmake
|
|
index d769e82f57..4936c8b00d 100644
|
|
--- a/configurecompiler.cmake
|
|
+++ b/configurecompiler.cmake
|
|
@@ -474,6 +474,7 @@ if (CLR_CMAKE_PLATFORM_UNIX)
|
|
add_compile_options(-Wno-unused-variable)
|
|
add_compile_options(-Wno-unused-value)
|
|
add_compile_options(-Wno-unused-function)
|
|
+ add_compile_options(-Wno-error=misleading-indentation)
|
|
|
|
#These seem to indicate real issues
|
|
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-invalid-offsetof>)
|
|
diff --git a/src/inc/slist.h b/src/inc/slist.h
|
|
index f05d763dc6..abebe04d47 100644
|
|
--- a/src/inc/slist.h
|
|
+++ b/src/inc/slist.h
|
|
@@ -160,13 +160,13 @@ public:
|
|
void Init()
|
|
{
|
|
LIMITED_METHOD_CONTRACT;
|
|
- m_pHead = &m_link;
|
|
+ m_pHead = PTR_SLink(&m_link);
|
|
// NOTE :: fHead variable is template argument
|
|
// the following code is a compiled in, only if the fHead flag
|
|
// is set to false,
|
|
if (!fHead)
|
|
{
|
|
- m_pTail = &m_link;
|
|
+ m_pTail = PTR_SLink(&m_link);
|
|
}
|
|
}
|
|
|
|
@@ -274,7 +274,7 @@ public:
|
|
SLink *ret = SLink::FindAndRemove(m_pHead, GetLink(pObj), &prior);
|
|
|
|
if (ret == m_pTail)
|
|
- m_pTail = prior;
|
|
+ m_pTail = PTR_SLink(prior);
|
|
|
|
return GetObject(ret);
|
|
}
|
|
diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h
|
|
index 08a35c8f62..43eb648a14 100644
|
|
--- a/src/pal/inc/pal.h
|
|
+++ b/src/pal/inc/pal.h
|
|
@@ -145,7 +145,7 @@ typedef PVOID NATIVE_LIBRARY_HANDLE;
|
|
|
|
/******************* Compiler-specific glue *******************************/
|
|
#ifndef THROW_DECL
|
|
-#if defined(_MSC_VER) || defined(__llvm__) || !defined(__cplusplus)
|
|
+#if defined(_MSC_VER) || !defined(__cplusplus)
|
|
#define THROW_DECL
|
|
#else
|
|
#define THROW_DECL throw()
|