summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2017-10-17 14:26:53 -0500
committerGerrit Code Review2017-10-17 14:26:53 -0500
commit796987482f3a56c4bc7ab7500a5dbe033ff11ae1 (patch)
tree766b8ed89e3e9ca1f063049fc2eb63fbb1a81eb2
parent4ff2607ef719bade2b45538878136a7d71621882 (diff)
parenta0f73f9bffc2ed6f78b9900db09741861676dd48 (diff)
downloadplatform-system-core-796987482f3a56c4bc7ab7500a5dbe033ff11ae1.tar.gz
platform-system-core-796987482f3a56c4bc7ab7500a5dbe033ff11ae1.tar.xz
platform-system-core-796987482f3a56c4bc7ab7500a5dbe033ff11ae1.zip
Merge "<stdbool.h> not necessary in C++."
-rw-r--r--healthd/healthd_mode_charger.cpp1
-rw-r--r--libcutils/fs_config.cpp1
-rw-r--r--libcutils/properties.cpp1
-rw-r--r--libsparse/sparse_read.cpp1
-rw-r--r--logcat/getopt_long.cpp1
-rw-r--r--trusty/storage/tests/main.cpp1
6 files changed, 0 insertions, 6 deletions
diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
index c76762d37..032b21433 100644
--- a/healthd/healthd_mode_charger.cpp
+++ b/healthd/healthd_mode_charger.cpp
@@ -19,7 +19,6 @@
19#include <fcntl.h> 19#include <fcntl.h>
20#include <inttypes.h> 20#include <inttypes.h>
21#include <linux/input.h> 21#include <linux/input.h>
22#include <stdbool.h>
23#include <stdio.h> 22#include <stdio.h>
24#include <stdlib.h> 23#include <stdlib.h>
25#include <string.h> 24#include <string.h>
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index bab095ede..d54eeaeb8 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -22,7 +22,6 @@
22 22
23#include <errno.h> 23#include <errno.h>
24#include <fcntl.h> 24#include <fcntl.h>
25#include <stdbool.h>
26#include <stdint.h> 25#include <stdint.h>
27#include <stdio.h> 26#include <stdio.h>
28#include <stdlib.h> 27#include <stdlib.h>
diff --git a/libcutils/properties.cpp b/libcutils/properties.cpp
index d2645e640..25ff1a3ad 100644
--- a/libcutils/properties.cpp
+++ b/libcutils/properties.cpp
@@ -21,7 +21,6 @@
21#include <ctype.h> 21#include <ctype.h>
22#include <errno.h> 22#include <errno.h>
23#include <inttypes.h> 23#include <inttypes.h>
24#include <stdbool.h>
25#include <stdlib.h> 24#include <stdlib.h>
26#include <string.h> 25#include <string.h>
27#include <unistd.h> 26#include <unistd.h>
diff --git a/libsparse/sparse_read.cpp b/libsparse/sparse_read.cpp
index 91d551c14..437963527 100644
--- a/libsparse/sparse_read.cpp
+++ b/libsparse/sparse_read.cpp
@@ -21,7 +21,6 @@
21#include <inttypes.h> 21#include <inttypes.h>
22#include <fcntl.h> 22#include <fcntl.h>
23#include <stdarg.h> 23#include <stdarg.h>
24#include <stdbool.h>
25#include <stdint.h> 24#include <stdint.h>
26#include <stdio.h> 25#include <stdio.h>
27#include <stdlib.h> 26#include <stdlib.h>
diff --git a/logcat/getopt_long.cpp b/logcat/getopt_long.cpp
index 5f8dd66e3..da999069d 100644
--- a/logcat/getopt_long.cpp
+++ b/logcat/getopt_long.cpp
@@ -49,7 +49,6 @@
49 * POSSIBILITY OF SUCH DAMAGE. 49 * POSSIBILITY OF SUCH DAMAGE.
50 */ 50 */
51 51
52#include <stdbool.h>
53#include <stdio.h> 52#include <stdio.h>
54#include <stdlib.h> 53#include <stdlib.h>
55#include <string.h> 54#include <string.h>
diff --git a/trusty/storage/tests/main.cpp b/trusty/storage/tests/main.cpp
index 1fd6f8ddc..45291360d 100644
--- a/trusty/storage/tests/main.cpp
+++ b/trusty/storage/tests/main.cpp
@@ -16,7 +16,6 @@
16 16
17#include <assert.h> 17#include <assert.h>
18#include <stdint.h> 18#include <stdint.h>
19#include <stdbool.h>
20#include <gtest/gtest.h> 19#include <gtest/gtest.h>
21 20
22#include <trusty/lib/storage.h> 21#include <trusty/lib/storage.h>