瀏覽代碼

fixes dependency on different header order for types

Derek Morris 8 年之前
父節點
當前提交
5a91f5c5ad
共有 3 個文件被更改,包括 4 次插入4 次删除
  1. 1 1
      lib/Jsrt/Jsrt.cpp
  2. 2 2
      lib/Runtime/Library/ConcatString.cpp
  3. 1 1
      lib/Runtime/Library/ConcatString.h

+ 1 - 1
lib/Jsrt/Jsrt.cpp

@@ -4571,7 +4571,7 @@ CHAKRA_API JsCreateStringUtf16(
     return ContextAPINoScriptWrapper([&](Js::ScriptContext *scriptContext, TTDRecorder& _actionEntryPopper) -> JsErrorCode {
 
         Js::JavascriptString *stringValue = Js::LiteralStringWithPropertyStringPtr::
-            NewFromWideString((LPCWSTR)content, (CharCount)length, scriptContext->GetLibrary());
+            NewFromWideString(content, (CharCount)length, scriptContext->GetLibrary());
 
         PERFORM_JSRT_TTD_RECORD_ACTION(scriptContext, RecordJsRTCreateString, stringValue->GetSz(), stringValue->GetLength());
 

+ 2 - 2
lib/Runtime/Library/ConcatString.cpp

@@ -25,7 +25,7 @@ namespace Js
     }
 
     JavascriptString * LiteralStringWithPropertyStringPtr::
-    NewFromWideString(LPCWSTR wideString, const CharCount charCount, JavascriptLibrary *const library)
+    NewFromWideString(const char16 * wideString, const CharCount charCount, JavascriptLibrary *const library)
     {
         Assert(library != nullptr && wideString != nullptr);
 
@@ -55,7 +55,7 @@ namespace Js
             Js::JavascriptError::ThrowOutOfMemoryError(scriptContext);
         }
 
-        js_wmemcpy_s(destString, charCount, (LPWSTR)wideString, charCount);
+        js_wmemcpy_s(destString, charCount, wideString, charCount);
         destString[charCount] = char16(0);
 
         return (JavascriptString*) RecyclerNew(library->GetRecycler(), LiteralStringWithPropertyStringPtr, destString, charCount, library);

+ 1 - 1
lib/Runtime/Library/ConcatString.h

@@ -29,7 +29,7 @@ namespace Js
         NewFromCString(const char * cString, const CharCount charCount, JavascriptLibrary *const library);
 
         static JavascriptString *
-        NewFromWideString(LPCWSTR wString, const CharCount charCount, JavascriptLibrary *const library);
+        NewFromWideString(const char16 * wString, const CharCount charCount, JavascriptLibrary *const library);
 
         static JavascriptString * CreateEmptyString(JavascriptLibrary *const library);