diff options
| author | 2014-11-03 23:38:42 +0000 | |
|---|---|---|
| committer | 2014-11-03 23:38:43 +0000 | |
| commit | 668f0a356cba44c22d8ca0c9f4711613885d46a9 (patch) | |
| tree | 2a761d729c706abe8c4fca98e89d818e961a5168 /tools/aapt/Main.cpp | |
| parent | 3c7efdc00506e6561ca08933f0b2acf5e3f16b02 (diff) | |
| parent | 4bf58108d442b37ab4adf5ce3a4ecd63472ce254 (diff) | |
Merge "Fix issues that will be present in C++11" into lmp-mr1-dev
Diffstat (limited to 'tools/aapt/Main.cpp')
| -rw-r--r-- | tools/aapt/Main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp index 2857b59034ed..18b8e1ecfe49 100644 --- a/tools/aapt/Main.cpp +++ b/tools/aapt/Main.cpp @@ -11,9 +11,9 @@ #include <utils/List.h> #include <utils/Errors.h> -#include <stdlib.h> +#include <cstdlib> #include <getopt.h> -#include <assert.h> +#include <cassert> using namespace android; |