mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Various fixes related to the C++11/14 update (see issue #3140)
- Convert scoped_ptr to std::unique_ptr from <memory> - Convert arraysize to base::size from include/base/cef_cxx17_backports.h - Convert NULL to nullptr - Include include/base/cef_callback.h instead of include/base/cef_bind.h - Implicit conversion of CefRefPtr<T> or scoped_refptr<T> to T* is gone; use .get() instead See the issue for additional details.
This commit is contained in:
@@ -4,14 +4,13 @@
|
||||
|
||||
#include "tests/shared/browser/file_util.h"
|
||||
|
||||
#include "include/base/cef_build.h"
|
||||
#include "include/base/cef_scoped_ptr.h"
|
||||
#include "include/cef_task.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdio>
|
||||
#include <memory>
|
||||
|
||||
#include "include/base/cef_build.h"
|
||||
#include "include/cef_task.h"
|
||||
|
||||
namespace client {
|
||||
namespace file_util {
|
||||
|
||||
@@ -46,7 +45,7 @@ bool ReadFileToString(const std::string& path,
|
||||
return false;
|
||||
|
||||
const size_t kBufferSize = 1 << 16;
|
||||
scoped_ptr<char[]> buf(new char[kBufferSize]);
|
||||
std::unique_ptr<char[]> buf(new char[kBufferSize]);
|
||||
size_t len;
|
||||
size_t size = 0;
|
||||
bool read_status = true;
|
||||
|
Reference in New Issue
Block a user