Use fully qualified cli::array as it appears VS2015 gets confused wit…

…h the generic std::array (must be in the newer C++ library as code builds fine in VS2013) Resolves cefsharp#2049
yuanzp · May 16, 2017 · f93a387 · f93a387
1 parent 7ba2de4
commit f93a387
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CefSharp.Core/Internals/ClientAdapter.cpp b/CefSharp.Core/Internals/ClientAdapter.cpp
@@ -724,7 +724,8 @@ namespace CefSharp
             {
                 auto resourceHandler = static_cast<ByteArrayResourceHandler^>(handler);
 
-                array<Byte>^ buffer = resourceHandler->Data;
+                //NOTE: Prefix with cli:: namespace as VS2015 gets confused with std::array
+				cli::array<Byte>^ buffer = resourceHandler->Data;
                 pin_ptr<Byte> src = &buffer[0];
 
                 auto streamReader = CefStreamReader::CreateForData(static_cast<void*>(src), buffer->Length);

diff --git a/CefSharp.Core/SchemeHandlerFactoryWrapper.h b/CefSharp.Core/SchemeHandlerFactoryWrapper.h
@@ -66,7 +66,8 @@ namespace CefSharp
             {
                 auto resourceHandler = static_cast<ByteArrayResourceHandler^>(handler);
 
-                array<Byte>^ buffer = resourceHandler->Data;
+				//NOTE: Prefix with cli:: namespace as VS2015 gets confused with std::array
+				cli::array<Byte>^ buffer = resourceHandler->Data;
                 pin_ptr<Byte> src = &buffer[0];
 
                 auto streamReader = CefStreamReader::CreateForData(static_cast<void*>(src), buffer->Length);