libchromeos: Move Any from Buffet to libchromeos. Move the Any class from Buffet to libchromeos and changed its namespace from buffet:: to chromeos:: Updated the rest of Buffet code to with the changes to the class's namespace and header file location. Also, now that move constructors are officially allowed by Google C++ coding style for project with C++11 feature support, added back the move constructor to Any as per http://crbug.com/387902 BUG=chromium:405714,chromium:387902 TEST=USE=buffet ./build_packages Change-Id: Id007f51b874934e4f6428fe90674495edeb79107 Reviewed-on: https://chromium-review.googlesource.com/213831 Tested-by: Alex Vakulenko <avakulenko@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org> Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/buffet/commands/prop_values.h b/buffet/commands/prop_values.h index f568dd8..106ab1d 100644 --- a/buffet/commands/prop_values.h +++ b/buffet/commands/prop_values.h
@@ -9,9 +9,9 @@ #include <memory> #include <string> +#include <chromeos/any.h> #include <chromeos/error.h> -#include "buffet/any.h" #include "buffet/commands/schema_utils.h" namespace base { @@ -103,7 +103,7 @@ chromeos::ErrorPtr* error) = 0; // Returns the contained C++ value as Any. - virtual Any GetValueAsAny() const = 0; + virtual chromeos::Any GetValueAsAny() const = 0; // Return the type definition of this value. const PropType* GetPropType() const { return type_; } @@ -149,7 +149,7 @@ } // Helper methods to get and set the C++ representation of the value. - Any GetValueAsAny() const override { return value_; } + chromeos::Any GetValueAsAny() const override { return value_; } const T& GetValue() const { return value_; } void SetValue(T value) { value_ = std::move(value); }