diff options
author | Jan Vorlicek <janvorli@microsoft.com> | 2015-10-17 11:18:37 +0300 |
---|---|---|
committer | Jan Vorlicek <janvorli@microsoft.com> | 2015-10-24 18:38:19 +0300 |
commit | b8ee1855645d427fd9a1ad17f9270340a42f96a0 (patch) | |
tree | 5d66f0d662b5c7f8441e356f2e157796cf5656e7 /src/Native/Runtime/RhConfig.h | |
parent | 86b0cc9a82ae0655eb334ca4aacf9a384a05b89b (diff) |
Enable compilation of the runtime on Linux
This change enables compilation of the runtime excluding the PAL
layer on Linux.
Most of the changes are just to make it build with clang that's
more strict w.r.t. the C++11 standard.
In addition to that, I have removed our implementation of the
new / delete operators and replaced all calls to new in the
runtime by new (nothrow).
Diffstat (limited to 'src/Native/Runtime/RhConfig.h')
-rw-r--r-- | src/Native/Runtime/RhConfig.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Native/Runtime/RhConfig.h b/src/Native/Runtime/RhConfig.h index c5e9f3617..2c66698c2 100644 --- a/src/Native/Runtime/RhConfig.h +++ b/src/Native/Runtime/RhConfig.h @@ -80,7 +80,7 @@ public: private: - UInt32 ReadConfigValue(_In_z_ WCHAR *wszName); + UInt32 ReadConfigValue(_In_z_ const WCHAR *wszName); enum RhConfigValue { @@ -96,7 +96,7 @@ private: #define CONFIG_FILE_MAXLEN RCV_Count * sizeof(ConfigPair) + 2000 private: - _Ret_maybenull_z_ WCHAR* RhConfig::GetConfigPath(); + _Ret_maybenull_z_ WCHAR* GetConfigPath(); //Parses one line of rhconfig.ini and populates values in the passed in configPair //returns: true if the parsing was successful, false if the parsing failed. @@ -113,7 +113,7 @@ private: //lazily reads the file so if the file is not yet read, it will read it on first called //if the file is not avaliable, or unreadable zero will always be returned //cchOuputBuffer is the maximum number of characters to write to outputBuffer - UInt32 GetIniVariable(_In_z_ WCHAR* configName, _Out_writes_all_(cchBuff) WCHAR* outputBuffer, _In_ UInt32 cchOuputBuffer); + UInt32 GetIniVariable(_In_z_ const WCHAR* configName, _Out_writes_all_(cchBuff) WCHAR* outputBuffer, _In_ UInt32 cchOuputBuffer); static bool priv_isspace(char c) { |