From db20f3f1bb8595633a7e16c8900fd401a453a6b5 Mon Sep 17 00:00:00 2001 From: Jiyoung Yun Date: Tue, 27 Dec 2016 16:46:08 +0900 Subject: Imported Upstream version 1.0.0.9127 --- src/gc/sample/gcenv.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/gc/sample/gcenv.h') diff --git a/src/gc/sample/gcenv.h b/src/gc/sample/gcenv.h index d560789751..4505f1af30 100644 --- a/src/gc/sample/gcenv.h +++ b/src/gc/sample/gcenv.h @@ -2,6 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +// The sample is to be kept simple, so building the sample +// in tandem with a standalone GC is currently not supported. +#ifdef FEATURE_STANDALONE_GC +#undef FEATURE_STANDALONE_GC +#endif // FEATURE_STANDALONE_GC + #if defined(_DEBUG) #ifndef _DEBUG_IMPL #define _DEBUG_IMPL 1 @@ -17,12 +23,12 @@ #include "gcenv.structs.h" #include "gcenv.base.h" -#include "gcenv.ee.h" #include "gcenv.os.h" #include "gcenv.interlocked.h" #include "gcenv.interlocked.inl" #include "gcenv.object.h" #include "gcenv.sync.h" +#include "gcenv.ee.h" #define MAX_LONGPATH 1024 @@ -64,6 +70,9 @@ #define LOG(x) +#define SVAL_IMPL_INIT(type, cls, var, init) \ + type cls::var = init + // // Thread // @@ -177,8 +186,6 @@ public: int GetGCTrimCommit() const { return 0; } int GetGCLOHCompactionMode() const { return 0; } - bool GetGCAllowVeryLargeObjects() const { return false; } - bool GetGCConservative() const { return true; } }; -- cgit v1.2.3