diff options
| author | Alex Vakulenko <avakulenko@chromium.org> | 2014-12-10 12:52:31 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-12-15 07:18:09 +0000 |
| commit | f3c689780c9c0cc5fd1630f01ee05060bb696403 (patch) | |
| tree | 0397b8818bfc61b2c075af9122cc74d37ec5b6f7 | |
| parent | 1f19109f49760b81f955c4b56ecc0529d83dd569 (diff) | |
| download | dbus-binding-generator-f3c689780c9c0cc5fd1630f01ee05060bb696403.tar.gz | |
Update libchrome to r307740 and fix build errors
Updated libchrome, libchrome_crypto, metrics, feedback to the
latest revisions from Chrome (r307740).
Fixed build breaks due to the changes in upstream code:
- scope_ptr no longer needs explicit PassAs<T>() calls.
- scope_ptr<T> no longer has implicit conversion to T*.
Must use scope_ptr<T>::get() instead.
- base/file_util.h moved to base/files/file_util.h
- ARRAYSIZE_UNSAFE() removed in favor of arraysize()
- base::AppendToFile() and base::WriteFileDescriptor() now
return bool instead of the number of bytes written.
- dbus::Bus::AddFilterFunction() now returns void.
- C++11 features are enabled in libchromeos, so all targets
linking with it now have to support C++11
- OVERRIDE macro is removed in favor of native C++11
'override' keyword.
BUG=chromium:416628, chromium:411508
TEST=Build the world on x86, x64, ARM. The following builders
were tried:
x86-generic-full amd64-generic-full arm-generic-full
amd64-generic-asan daisy-full nyan-full pre-cq-group
daisy-release-group sandybridge-release-group
pineview-release-group
CQ-DEPEND=CL:234450,CL:234980
Change-Id: I374bebe2211d533c4431c82efb8be1cdcb1f405d
Reviewed-on: https://chromium-review.googlesource.com/234440
Reviewed-by: Bertrand Simonnet <bsimonnet@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
6 files changed, 6 insertions, 6 deletions
diff --git a/chromeos-dbus-bindings/adaptor_generator_unittest.cc b/chromeos-dbus-bindings/adaptor_generator_unittest.cc index 957fa4b..c18b346 100644 --- a/chromeos-dbus-bindings/adaptor_generator_unittest.cc +++ b/chromeos-dbus-bindings/adaptor_generator_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#include <base/file_util.h> #include <base/files/file_path.h> +#include <base/files/file_util.h> #include <base/files/scoped_temp_dir.h> #include <gtest/gtest.h> diff --git a/chromeos-dbus-bindings/header_generator.cc b/chromeos-dbus-bindings/header_generator.cc index d08131d..0a24597 100644 --- a/chromeos-dbus-bindings/header_generator.cc +++ b/chromeos-dbus-bindings/header_generator.cc @@ -6,8 +6,8 @@ #include <string> -#include <base/file_util.h> #include <base/files/file_path.h> +#include <base/files/file_util.h> #include <base/strings/string_util.h> #include <base/strings/stringprintf.h> #include <chromeos/strings/string_utils.h> diff --git a/chromeos-dbus-bindings/method_name_generator_unittest.cc b/chromeos-dbus-bindings/method_name_generator_unittest.cc index d237350..f239c91 100644 --- a/chromeos-dbus-bindings/method_name_generator_unittest.cc +++ b/chromeos-dbus-bindings/method_name_generator_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#include <base/file_util.h> #include <base/files/file_path.h> +#include <base/files/file_util.h> #include <base/files/scoped_temp_dir.h> #include <gtest/gtest.h> diff --git a/chromeos-dbus-bindings/proxy_generator_unittest.cc b/chromeos-dbus-bindings/proxy_generator_unittest.cc index 2d26a2b..7251293 100644 --- a/chromeos-dbus-bindings/proxy_generator_unittest.cc +++ b/chromeos-dbus-bindings/proxy_generator_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#include <base/file_util.h> #include <base/files/file_path.h> +#include <base/files/file_util.h> #include <base/files/scoped_temp_dir.h> #include <gtest/gtest.h> diff --git a/chromeos-dbus-bindings/xml_interface_parser.cc b/chromeos-dbus-bindings/xml_interface_parser.cc index 46c36ac..8866662 100644 --- a/chromeos-dbus-bindings/xml_interface_parser.cc +++ b/chromeos-dbus-bindings/xml_interface_parser.cc @@ -6,8 +6,8 @@ #include <utility> -#include <base/file_util.h> #include <base/files/file_path.h> +#include <base/files/file_util.h> #include <base/logging.h> #include <base/strings/string_util.h> #include <chromeos/strings/string_utils.h> diff --git a/chromeos-dbus-bindings/xml_interface_parser_unittest.cc b/chromeos-dbus-bindings/xml_interface_parser_unittest.cc index 1d332ae..e81cb4f 100644 --- a/chromeos-dbus-bindings/xml_interface_parser_unittest.cc +++ b/chromeos-dbus-bindings/xml_interface_parser_unittest.cc @@ -4,8 +4,8 @@ #include "chromeos-dbus-bindings/xml_interface_parser.h" -#include <base/file_util.h> #include <base/files/file_path.h> +#include <base/files/file_util.h> #include <base/files/scoped_temp_dir.h> #include <gtest/gtest.h> |