X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbinder%2Finc%2Fapplicationcontext.hpp;h=cd1a2455e46dc214c67b6ae5fc12562173cfacea;hb=a374692390570b3efe4d4b4fe8894fd9c0b34d0f;hp=4c256771eb46a1cc6eaf32b8120f6b37bae04528;hpb=482c9e8e41bc56d417931ebda5ac9127b0de97a8;p=platform%2Fupstream%2Fcoreclr.git diff --git a/src/binder/inc/applicationcontext.hpp b/src/binder/inc/applicationcontext.hpp index 4c25677..cd1a245 100644 --- a/src/binder/inc/applicationcontext.hpp +++ b/src/binder/inc/applicationcontext.hpp @@ -38,7 +38,7 @@ namespace BINDER_SPACE typedef PCWSTR key_t; static const FileNameMapEntry Null() { FileNameMapEntry e; e.m_wszFileName = nullptr; return e; } static bool IsNull(const FileNameMapEntry & e) { return e.m_wszFileName == nullptr; } - static const key_t GetKey(const FileNameMapEntry & e) + static key_t GetKey(const FileNameMapEntry & e) { key_t key; key = e.m_wszFileName; @@ -65,7 +65,7 @@ namespace BINDER_SPACE typedef PCWSTR key_t; static const SimpleNameToFileNameMapEntry Null() { SimpleNameToFileNameMapEntry e; e.m_wszSimpleName = nullptr; return e; } static bool IsNull(const SimpleNameToFileNameMapEntry & e) { return e.m_wszSimpleName == nullptr; } - static const key_t GetKey(const SimpleNameToFileNameMapEntry & e) + static key_t GetKey(const SimpleNameToFileNameMapEntry & e) { key_t key; key = e.m_wszSimpleName; @@ -174,7 +174,6 @@ namespace BINDER_SPACE SimpleNameToFileNameMap * m_pTrustedPlatformAssemblyMap; TpaFileNameHash * m_pFileNameHash; -#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) bool m_fCanExplicitlyBindToNativeImages; public: inline void SetExplicitBindToNativeImages(bool fCanExplicitlyBindToNativeImages) @@ -187,7 +186,6 @@ public: return m_fCanExplicitlyBindToNativeImages; } protected: -#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) }; #include "applicationcontext.inl"