summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorElliott Hughes2018-06-26 19:17:41 -0500
committerElliott Hughes2018-06-26 19:17:41 -0500
commit4d8bbc6f8b5e18305b35147beea2d6c9c9d339b1 (patch)
tree48a5fd2469e87ee8cf69f9536d01030541d8f6c3 /base
parent2aa50ff56df2da8854c4209751a5d88c936f3c9b (diff)
downloadplatform-system-core-4d8bbc6f8b5e18305b35147beea2d6c9c9d339b1.tar.gz
platform-system-core-4d8bbc6f8b5e18305b35147beea2d6c9c9d339b1.tar.xz
platform-system-core-4d8bbc6f8b5e18305b35147beea2d6c9c9d339b1.zip
libbase: switch to #pragma once.
Bug: N/A Test: builds Change-Id: I125498ac4257ac4e901c6f2a5f1bfac1432d859d
Diffstat (limited to 'base')
-rw-r--r--base/include/android-base/chrono_utils.h5
-rw-r--r--base/include/android-base/endian.h5
-rw-r--r--base/include/android-base/errors.h5
-rw-r--r--base/include/android-base/file.h5
-rw-r--r--base/include/android-base/logging.h5
-rw-r--r--base/include/android-base/macros.h5
-rw-r--r--base/include/android-base/memory.h5
-rw-r--r--base/include/android-base/parsedouble.h5
-rw-r--r--base/include/android-base/parseint.h5
-rw-r--r--base/include/android-base/parsenetaddress.h5
-rw-r--r--base/include/android-base/properties.h5
-rw-r--r--base/include/android-base/scopeguard.h5
-rw-r--r--base/include/android-base/stringprintf.h5
-rw-r--r--base/include/android-base/strings.h5
-rw-r--r--base/include/android-base/test_utils.h5
-rw-r--r--base/include/android-base/thread_annotations.h5
-rw-r--r--base/include/android-base/threads.h5
-rw-r--r--base/include/android-base/unique_fd.h5
-rwxr-xr-xbase/include/android-base/utf8.h5
19 files changed, 19 insertions, 76 deletions
diff --git a/base/include/android-base/chrono_utils.h b/base/include/android-base/chrono_utils.h
index b7647f22c..11fcf710e 100644
--- a/base/include/android-base/chrono_utils.h
+++ b/base/include/android-base/chrono_utils.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_CHRONO_UTILS_H 17#pragma once
18#define ANDROID_BASE_CHRONO_UTILS_H
19 18
20#include <chrono> 19#include <chrono>
21#include <sstream> 20#include <sstream>
@@ -52,5 +51,3 @@ std::ostream& operator<<(std::ostream& os, const Timer& t);
52 51
53} // namespace base 52} // namespace base
54} // namespace android 53} // namespace android
55
56#endif // ANDROID_BASE_CHRONO_UTILS_H
diff --git a/base/include/android-base/endian.h b/base/include/android-base/endian.h
index 6eb677cd3..cbbd8c9bc 100644
--- a/base/include/android-base/endian.h
+++ b/base/include/android-base/endian.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_ENDIAN_H 17#pragma once
18#define ANDROID_BASE_ENDIAN_H
19 18
20/* A cross-platform equivalent of bionic's <sys/endian.h>. */ 19/* A cross-platform equivalent of bionic's <sys/endian.h>. */
21 20
@@ -86,5 +85,3 @@
86#define le64toh(x) (x) 85#define le64toh(x) (x)
87 86
88#endif 87#endif
89
90#endif // ANDROID_BASE_ENDIAN_H
diff --git a/base/include/android-base/errors.h b/base/include/android-base/errors.h
index 04c299c86..06f29fcac 100644
--- a/base/include/android-base/errors.h
+++ b/base/include/android-base/errors.h
@@ -27,8 +27,7 @@
27// special handling to get the error string. Refer to Microsoft documentation 27// special handling to get the error string. Refer to Microsoft documentation
28// to determine which error code to check for each function. 28// to determine which error code to check for each function.
29 29
30#ifndef ANDROID_BASE_ERRORS_H 30#pragma once
31#define ANDROID_BASE_ERRORS_H
32 31
33#include <string> 32#include <string>
34 33
@@ -42,5 +41,3 @@ std::string SystemErrorCodeToString(int error_code);
42 41
43} // namespace base 42} // namespace base
44} // namespace android 43} // namespace android
45
46#endif // ANDROID_BASE_ERRORS_H
diff --git a/base/include/android-base/file.h b/base/include/android-base/file.h
index 667d6fbe2..908690ba6 100644
--- a/base/include/android-base/file.h
+++ b/base/include/android-base/file.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_FILE_H 17#pragma once
18#define ANDROID_BASE_FILE_H
19 18
20#include <sys/stat.h> 19#include <sys/stat.h>
21#include <sys/types.h> 20#include <sys/types.h>
@@ -78,5 +77,3 @@ std::string Dirname(const std::string& path);
78 77
79} // namespace base 78} // namespace base
80} // namespace android 79} // namespace android
81
82#endif // ANDROID_BASE_FILE_H
diff --git a/base/include/android-base/logging.h b/base/include/android-base/logging.h
index 05a12e71a..7f0801f6c 100644
--- a/base/include/android-base/logging.h
+++ b/base/include/android-base/logging.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_LOGGING_H 17#pragma once
18#define ANDROID_BASE_LOGGING_H
19 18
20// 19//
21// Google-style C++ logging. 20// Google-style C++ logging.
@@ -506,5 +505,3 @@ inline std::ostream& operator<<(std::ostream& stream, const std::string* string_
506#undef OSTREAM_STRING_POINTER_USAGE_WARNING 505#undef OSTREAM_STRING_POINTER_USAGE_WARNING
507 506
508} // namespace std 507} // namespace std
509
510#endif // ANDROID_BASE_LOGGING_H
diff --git a/base/include/android-base/macros.h b/base/include/android-base/macros.h
index fd6efb2a8..0c8eac03c 100644
--- a/base/include/android-base/macros.h
+++ b/base/include/android-base/macros.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_MACROS_H 17#pragma once
18#define ANDROID_BASE_MACROS_H
19 18
20#include <stddef.h> // for size_t 19#include <stddef.h> // for size_t
21#include <unistd.h> // for TEMP_FAILURE_RETRY 20#include <unistd.h> // for TEMP_FAILURE_RETRY
@@ -197,5 +196,3 @@ void UNUSED(const T&...) {
197#elif defined(__mips__) && defined(__LP64__) 196#elif defined(__mips__) && defined(__LP64__)
198#define ABI_STRING "mips64" 197#define ABI_STRING "mips64"
199#endif 198#endif
200
201#endif // ANDROID_BASE_MACROS_H
diff --git a/base/include/android-base/memory.h b/base/include/android-base/memory.h
index 997122623..0277a034e 100644
--- a/base/include/android-base/memory.h
+++ b/base/include/android-base/memory.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_MEMORY_H 17#pragma once
18#define ANDROID_BASE_MEMORY_H
19 18
20namespace android { 19namespace android {
21namespace base { 20namespace base {
@@ -37,5 +36,3 @@ static inline void put_unaligned(void* address, T v) {
37 36
38} // namespace base 37} // namespace base
39} // namespace android 38} // namespace android
40
41#endif // ANDROID_BASE_MEMORY_H
diff --git a/base/include/android-base/parsedouble.h b/base/include/android-base/parsedouble.h
index daa69024c..c273c61d3 100644
--- a/base/include/android-base/parsedouble.h
+++ b/base/include/android-base/parsedouble.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_PARSEDOUBLE_H 17#pragma once
18#define ANDROID_BASE_PARSEDOUBLE_H
19 18
20#include <errno.h> 19#include <errno.h>
21#include <stdlib.h> 20#include <stdlib.h>
@@ -46,5 +45,3 @@ static inline bool ParseDouble(const char* s, double* out,
46 45
47} // namespace base 46} // namespace base
48} // namespace android 47} // namespace android
49
50#endif // ANDROID_BASE_PARSEDOUBLE_H
diff --git a/base/include/android-base/parseint.h b/base/include/android-base/parseint.h
index 1b7cc5fa6..b0fc7c3f3 100644
--- a/base/include/android-base/parseint.h
+++ b/base/include/android-base/parseint.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_PARSEINT_H 17#pragma once
18#define ANDROID_BASE_PARSEINT_H
19 18
20#include <errno.h> 19#include <errno.h>
21#include <stdlib.h> 20#include <stdlib.h>
@@ -104,5 +103,3 @@ bool ParseInt(const std::string& s, T* out,
104 103
105} // namespace base 104} // namespace base
106} // namespace android 105} // namespace android
107
108#endif // ANDROID_BASE_PARSEINT_H
diff --git a/base/include/android-base/parsenetaddress.h b/base/include/android-base/parsenetaddress.h
index b4ac0256b..47f8b5f6e 100644
--- a/base/include/android-base/parsenetaddress.h
+++ b/base/include/android-base/parsenetaddress.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_PARSENETADDRESS_H 17#pragma once
18#define ANDROID_BASE_PARSENETADDRESS_H
19 18
20#include <string> 19#include <string>
21 20
@@ -34,5 +33,3 @@ bool ParseNetAddress(const std::string& address, std::string* host, int* port,
34 33
35} // namespace base 34} // namespace base
36} // namespace android 35} // namespace android
37
38#endif // ANDROID_BASE_PARSENETADDRESS_H
diff --git a/base/include/android-base/properties.h b/base/include/android-base/properties.h
index 3a051435c..31e52731d 100644
--- a/base/include/android-base/properties.h
+++ b/base/include/android-base/properties.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_PROPERTIES_H 17#pragma once
18#define ANDROID_BASE_PROPERTIES_H
19 18
20#include <sys/cdefs.h> 19#include <sys/cdefs.h>
21 20
@@ -73,5 +72,3 @@ bool WaitForPropertyCreation(const std::string& key, std::chrono::milliseconds r
73 72
74} // namespace base 73} // namespace base
75} // namespace android 74} // namespace android
76
77#endif // ANDROID_BASE_PROPERTIES_H
diff --git a/base/include/android-base/scopeguard.h b/base/include/android-base/scopeguard.h
index c314e0263..e6a9d109d 100644
--- a/base/include/android-base/scopeguard.h
+++ b/base/include/android-base/scopeguard.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_SCOPEGUARD_H 17#pragma once
18#define ANDROID_BASE_SCOPEGUARD_H
19 18
20#include <utility> // for std::move, std::forward 19#include <utility> // for std::move, std::forward
21 20
@@ -66,5 +65,3 @@ ScopeGuard<F> make_scope_guard(F&& f) {
66 65
67} // namespace base 66} // namespace base
68} // namespace android 67} // namespace android
69
70#endif // ANDROID_BASE_SCOPEGUARD_H
diff --git a/base/include/android-base/stringprintf.h b/base/include/android-base/stringprintf.h
index c13d25d37..93c56afd7 100644
--- a/base/include/android-base/stringprintf.h
+++ b/base/include/android-base/stringprintf.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_STRINGPRINTF_H 17#pragma once
18#define ANDROID_BASE_STRINGPRINTF_H
19 18
20#include <stdarg.h> 19#include <stdarg.h>
21#include <string> 20#include <string>
@@ -39,5 +38,3 @@ void StringAppendV(std::string* dst, const char* format, va_list ap)
39 38
40} // namespace base 39} // namespace base
41} // namespace android 40} // namespace android
42
43#endif // ANDROID_BASE_STRINGPRINTF_H
diff --git a/base/include/android-base/strings.h b/base/include/android-base/strings.h
index 4d9fa3404..9c3556084 100644
--- a/base/include/android-base/strings.h
+++ b/base/include/android-base/strings.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_STRINGS_H 17#pragma once
18#define ANDROID_BASE_STRINGS_H
19 18
20#include <sstream> 19#include <sstream>
21#include <string> 20#include <string>
@@ -75,5 +74,3 @@ bool EqualsIgnoreCase(const std::string& lhs, const std::string& rhs);
75 74
76} // namespace base 75} // namespace base
77} // namespace android 76} // namespace android
78
79#endif // ANDROID_BASE_STRINGS_H
diff --git a/base/include/android-base/test_utils.h b/base/include/android-base/test_utils.h
index b29676f7c..9e2ea97f2 100644
--- a/base/include/android-base/test_utils.h
+++ b/base/include/android-base/test_utils.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_TEST_UTILS_H 17#pragma once
18#define ANDROID_BASE_TEST_UTILS_H
19 18
20#include <regex> 19#include <regex>
21#include <string> 20#include <string>
@@ -114,5 +113,3 @@ class CapturedStdout : public CapturedStdFd {
114 ADD_FAILURE() << "regex mismatch: expected to not find " << (pattern) << " in:\n" << (str); \ 113 ADD_FAILURE() << "regex mismatch: expected to not find " << (pattern) << " in:\n" << (str); \
115 } \ 114 } \
116 } while (0) 115 } while (0)
117
118#endif // ANDROID_BASE_TEST_UTILS_H
diff --git a/base/include/android-base/thread_annotations.h b/base/include/android-base/thread_annotations.h
index 1307f0e2c..d56e9355d 100644
--- a/base/include/android-base/thread_annotations.h
+++ b/base/include/android-base/thread_annotations.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_THREAD_ANNOTATIONS_H 17#pragma once
18#define ANDROID_BASE_THREAD_ANNOTATIONS_H
19 18
20#if defined(__SUPPORT_TS_ANNOTATION__) || defined(__clang__) 19#if defined(__SUPPORT_TS_ANNOTATION__) || defined(__clang__)
21#define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x)) 20#define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
@@ -109,5 +108,3 @@
109 108
110#define NO_THREAD_SAFETY_ANALYSIS \ 109#define NO_THREAD_SAFETY_ANALYSIS \
111 THREAD_ANNOTATION_ATTRIBUTE__(no_thread_safety_analysis) 110 THREAD_ANNOTATION_ATTRIBUTE__(no_thread_safety_analysis)
112
113#endif // ANDROID_BASE_THREAD_ANNOTATIONS_H
diff --git a/base/include/android-base/threads.h b/base/include/android-base/threads.h
index 85e65ba65..f4ba8091f 100644
--- a/base/include/android-base/threads.h
+++ b/base/include/android-base/threads.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_THREADS_H 17#pragma once
18#define ANDROID_BASE_THREADS_H
19 18
20#include <stdint.h> 19#include <stdint.h>
21 20
@@ -24,5 +23,3 @@ namespace base {
24uint64_t GetThreadId(); 23uint64_t GetThreadId();
25} 24}
26} // namespace android 25} // namespace android
27
28#endif
diff --git a/base/include/android-base/unique_fd.h b/base/include/android-base/unique_fd.h
index 5d8927198..d334e30ed 100644
--- a/base/include/android-base/unique_fd.h
+++ b/base/include/android-base/unique_fd.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_UNIQUE_FD_H 17#pragma once
18#define ANDROID_BASE_UNIQUE_FD_H
19 18
20#include <fcntl.h> 19#include <fcntl.h>
21 20
@@ -150,5 +149,3 @@ int close(const android::base::unique_fd_impl<T>&)
150#endif 149#endif
151 "close called on unique_fd" 150 "close called on unique_fd"
152 ))); 151 )));
153
154#endif // ANDROID_BASE_UNIQUE_FD_H
diff --git a/base/include/android-base/utf8.h b/base/include/android-base/utf8.h
index c9cc1ab0c..4b916232c 100755
--- a/base/include/android-base/utf8.h
+++ b/base/include/android-base/utf8.h
@@ -14,8 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#ifndef ANDROID_BASE_UTF8_H 17#pragma once
18#define ANDROID_BASE_UTF8_H
19 18
20#ifdef _WIN32 19#ifdef _WIN32
21#include <string> 20#include <string>
@@ -102,5 +101,3 @@ using ::unlink;
102} // namespace utf8 101} // namespace utf8
103} // namespace base 102} // namespace base
104} // namespace android 103} // namespace android
105
106#endif // ANDROID_BASE_UTF8_H