Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5aaa81d authored Jun 27, 2018 by Treehugger Robot Committed by Gerrit Code Review Jun 27, 2018

Merge "libbase: switch to #pragma once."

parents b4a2f579 4d8bbc6f

base/include/android-base/chrono_utils.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,7 @@
		* limitations under the License.
		*/

		#ifndef ANDROID_BASE_CHRONO_UTILS_H
		#define ANDROID_BASE_CHRONO_UTILS_H
		#pragma once

		#include <chrono>
		#include <sstream>
		@@ -52,5 +51,3 @@ std::ostream& operator<<(std::ostream& os, const Timer& t);

		} // namespace base
		} // namespace android

		#endif // ANDROID_BASE_CHRONO_UTILS_H

base/include/android-base/endian.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,7 @@
		* limitations under the License.
		*/

		#ifndef ANDROID_BASE_ENDIAN_H
		#define ANDROID_BASE_ENDIAN_H
		#pragma once

		/* A cross-platform equivalent of bionic's <sys/endian.h>. */

		@@ -86,5 +85,3 @@
		#define le64toh(x) (x)

		#endif

		#endif // ANDROID_BASE_ENDIAN_H

base/include/android-base/errors.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -27,8 +27,7 @@
		// special handling to get the error string. Refer to Microsoft documentation
		// to determine which error code to check for each function.

		#ifndef ANDROID_BASE_ERRORS_H
		#define ANDROID_BASE_ERRORS_H
		#pragma once

		#include <string>

		@@ -42,5 +41,3 @@ std::string SystemErrorCodeToString(int error_code);

		} // namespace base
		} // namespace android

		#endif // ANDROID_BASE_ERRORS_H

base/include/android-base/file.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,7 @@
		* limitations under the License.
		*/

		#ifndef ANDROID_BASE_FILE_H
		#define ANDROID_BASE_FILE_H
		#pragma once

		#include <sys/stat.h>
		#include <sys/types.h>
		@@ -78,5 +77,3 @@ std::string Dirname(const std::string& path);

		} // namespace base
		} // namespace android

		#endif // ANDROID_BASE_FILE_H

base/include/android-base/logging.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,7 @@
		* limitations under the License.
		*/

		#ifndef ANDROID_BASE_LOGGING_H
		#define ANDROID_BASE_LOGGING_H
		#pragma once

		//
		// Google-style C++ logging.
		@@ -506,5 +505,3 @@ inline std::ostream& operator<<(std::ostream& stream, const std::string* string_
		#undef OSTREAM_STRING_POINTER_USAGE_WARNING

		} // namespace std

		#endif // ANDROID_BASE_LOGGING_H