diff options
| author | Jesse Hall <jessehall@google.com> | 2016-04-05 21:16:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-05 21:16:36 +0000 |
| commit | fe6ca3bc83264c7e72542c245c59b5399cd0cdf0 (patch) | |
| tree | 03da67b4f982d925123529a6fd37de39d6185b01 | |
| parent | 42a6ff34e083779a591b5e716f5b9127beac7b5c (diff) | |
| parent | 97b3e146edf142f588fce74c707206052a16ea01 (diff) | |
| download | vulkan-validation-layers-fe6ca3bc83264c7e72542c245c59b5399cd0cdf0.tar.gz | |
Merge remote-tracking branch \'aosp/upstream-android_layers\' into aosp-master am: bb38d61
am: 97b3e14
* commit '97b3e146edf142f588fce74c707206052a16ea01':
vkjson: Fix include paths and clang errors
Change-Id: Ib44e2012e9f1ffbad59096bd6ed11d1b3822b675
| -rw-r--r-- | libs/vkjson/vkjson.cc | 8 | ||||
| -rw-r--r-- | libs/vkjson/vkjson_device.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/vkjson/vkjson.cc b/libs/vkjson/vkjson.cc index 2910d421a..6e83ad891 100644 --- a/libs/vkjson/vkjson.cc +++ b/libs/vkjson/vkjson.cc @@ -39,8 +39,8 @@ #include <type_traits> #include <utility> -#include "cJSON.h" -#include "vk_sdk_platform.h" +#include <cJSON.h> +#include <vulkan/vk_sdk_platform.h> namespace { @@ -456,7 +456,7 @@ inline void VisitForWrite(Visitor* visitor, const T& t) { Iterate(visitor, const_cast<T*>(&t)); } -template <typename T, typename = EnableForStruct<T>, typename = void> +template <typename T, typename /*= EnableForStruct<T>*/, typename /*= void*/> cJSON* ToJsonValue(const T& value) { JsonWriterVisitor visitor; VisitForWrite(&visitor, value); @@ -634,7 +634,7 @@ class JsonReaderVisitor { std::string* errors_; }; -template <typename T, typename = EnableForStruct<T>> +template <typename T, typename /*= EnableForStruct<T>*/> bool AsValue(cJSON* json_value, T* t) { if (json_value->type != cJSON_Object) return false; diff --git a/libs/vkjson/vkjson_device.cc b/libs/vkjson/vkjson_device.cc index 9e96c7220..fc9540efe 100644 --- a/libs/vkjson/vkjson_device.cc +++ b/libs/vkjson/vkjson_device.cc @@ -65,7 +65,7 @@ VkJsonAllProperties VkJsonGetAllProperties(VkPhysicalDevice physical_device) { properties.layers.data()); } - VkFormatProperties format_properties = {0}; + VkFormatProperties format_properties = {}; for (VkFormat format = VK_FORMAT_R4G4_UNORM_PACK8; format <= VK_FORMAT_END_RANGE; format = static_cast<VkFormat>(format + 1)) { |