projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3796 from ntherning/windows-backend-for-MemoryMappedFile
[mono.git]
/
mcs
/
class
/
referencesource
/
mscorlib
/
system
/
sharedstatics.cs
diff --git
a/mcs/class/referencesource/mscorlib/system/sharedstatics.cs
b/mcs/class/referencesource/mscorlib/system/sharedstatics.cs
index 87f99a67da32e48e877ea0dd67b3c9870853210a..d455031e761f11b233eb55b65ffbbc57c7164458 100644
(file)
--- a/
mcs/class/referencesource/mscorlib/system/sharedstatics.cs
+++ b/
mcs/class/referencesource/mscorlib/system/sharedstatics.cs
@@
-28,6
+28,15
@@
namespace System {
internal sealed class SharedStatics
{
internal sealed class SharedStatics
{
+#if MONO
+ // TODO: We are using only GetSharedStringMaker for now which is
+ // ok to be AppDomain static
+ static readonly SharedStatics _sharedStatics = new SharedStatics();
+
+ private SharedStatics()
+ {
+ }
+#else
// this is declared static but is actually forced to be the same object
// for each AppDomain at AppDomain create time.
private static SharedStatics _sharedStatics;
// this is declared static but is actually forced to be the same object
// for each AppDomain at AppDomain create time.
private static SharedStatics _sharedStatics;
@@
-38,6
+47,7
@@
namespace System {
{
BCLDebug.Assert(false, "SharedStatics..ctor() is never called.");
}
{
BCLDebug.Assert(false, "SharedStatics..ctor() is never called.");
}
+#endif
private volatile String _Remoting_Identity_IDGuid;
public static String Remoting_Identity_IDGuid
private volatile String _Remoting_Identity_IDGuid;
public static String Remoting_Identity_IDGuid