)]}' { "commit": "1f3bea35a57fafd75ac010eae078a256a3eda25e", "tree": "d63b68dce2498ac2befe83c169065684d4d87772", "parents": [ "5d5faf68cdb05e477f0637f517f4926a0db1394a" ], "author": { "name": "Manoj Gupta", "email": "manojgupta@google.com", "time": "Tue May 23 11:06:01 2017 -0700" }, "committer": { "name": "chrome-bot", "email": "chrome-bot@chromium.org", "time": "Tue Jun 27 10:55:49 2017 -0700" }, "message": "Fix compiler errors when using libc++ in verity.\n\nRename macros min,max and to_bytes.\nmin and max macros are no longer allowed in c++.\nto_bytes conflict with a header function in \u003clocale\u003e.\n\nFixes compilation errors:\n/build/caroline/usr/include/c++/v1/locale:3596:48: error: too many arguments\nverity-9999: provided to function-like macro invocation\nverity-9999: byte_string to_bytes(const _Elem* __first, const _Elem* __last);\nverity-9999: /mnt/host/source/src/platform/verity/include/linux/device-mapper.h:31:9: note:\nverity-9999: macro \u0027to_bytes\u0027 defined here\nverity-9999: #define to_bytes(x) ((x) \u003c\u003c SECTOR_SHIFT)\n\nverity-9999: /build/caroline/usr/include/c++/v1/__undef_min_max:17:2: error: macro min is\nverity-9999: incompatible with C++. #undefing min [-Werror,-W#warnings]\nverity-9999: #warning: macro min is incompatible with C++. #undefing min\nverity-9999: /build/caroline/usr/include/c++/v1/__undef_min_max:29:2: error: macro max is\nverity-9999: incompatible with C++. #undefing max [-Werror,-W#warnings]\nverity-9999: #warning: macro max is incompatible with C++. #undefing max\n\nBUG\u003dchromium:724628\nTEST\u003dverity compiles.\n\nChange-Id: I709edbe48085c3dd692037957f9139010e9e5844\nReviewed-on: https://chromium-review.googlesource.com/547454\nCommit-Ready: Manoj Gupta \u003cmanojgupta@chromium.org\u003e\nTested-by: Manoj Gupta \u003cmanojgupta@chromium.org\u003e\nReviewed-by: Sonny Rao \u003csonnyrao@chromium.org\u003e\n", "tree_diff": [ { "type": "modify", "old_id": "ccc7a1708b92360692bea22aec705896326b7bbe", "old_mode": 33188, "old_path": "dm-bht.c", "new_id": "c190b69269f9f58c121680daabe142659dfdf088", "new_mode": 33188, "new_path": "dm-bht.c" }, { "type": "modify", "old_id": "2eadf84efa79c4c2017b185b16964762a565e113", "old_mode": 33188, "old_path": "dm-bht_unittest.cc", "new_id": "ae82bf4a87f2008a170cd4748fd0ff3db37f81a4", "new_mode": 33188, "new_path": "dm-bht_unittest.cc" }, { "type": "modify", "old_id": "d98186eeef54c84b3a8462b1caa6cf26ec5ab6d8", "old_mode": 33188, "old_path": "file_hasher.cc", "new_id": "1066965b7e022c8641aeca2563ae079d6ad23f95", "new_mode": 33188, "new_path": "file_hasher.cc" }, { "type": "modify", "old_id": "db2b90b493a5e3546a1a5a0026712aa0841ee64a", "old_mode": 33188, "old_path": "include/linux/device-mapper.h", "new_id": "0d22467deea3c5435cadbd47ed065385782ed1e1", "new_mode": 33188, "new_path": "include/linux/device-mapper.h" }, { "type": "modify", "old_id": "16deee3463de06ef7a594c2fde1101d42266e3d8", "old_mode": 33188, "old_path": "include/linux/kernel.h", "new_id": "ca0893d3036517637e5ecde7e07a17c34d820c32", "new_mode": 33188, "new_path": "include/linux/kernel.h" } ] }