Merge "Fix warnings in libutils headers" (0f79b62b) · Commits · e / os / android_system_core

include/utils/Compat.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -45,13 +45,8 @@ static inline ssize_t pwrite64(int fd, const void* buf, size_t nbytes, off64_t o
		#define DEFFILEMODE 0666
		#endif /* _WIN32 */

		#if defined(_WIN32)
		#define ZD "%ld"
		#define ZD_TYPE long
		#else
		#define ZD "%zd"
		#define ZD_TYPE ssize_t
		#endif

		/*
		* Needed for cases where something should be constexpr if possible, but not

+3 −6

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#ifndef _LIBS_UTILS_CONDITION_H
		#define _LIBS_UTILS_CONDITION_H

		#include <limits.h>
		#include <stdint.h>
		#include <sys/types.h>
		#include <time.h>
		@@ -120,7 +121,7 @@ inline status_t Condition::waitRelative(Mutex& mutex, nsecs_t reltime) {
		// On 32-bit devices, tv_sec is 32-bit, but `reltime` is 64-bit.
		int64_t reltime_sec = reltime/1000000000;

		ts.tv_nsec += reltime%1000000000;
		ts.tv_nsec += static_cast<long>(reltime%1000000000);
		if (reltime_sec < INT64_MAX && ts.tv_nsec >= 1000000000) {
		ts.tv_nsec -= 1000000000;
		++reltime_sec;
		@@ -133,11 +134,7 @@ inline status_t Condition::waitRelative(Mutex& mutex, nsecs_t reltime) {
		time_sec += reltime_sec;
		}

		#if defined(__LP64__)
		ts.tv_sec = time_sec;
		#else
		ts.tv_sec = (time_sec > INT32_MAX) ? INT32_MAX : time_sec;
		#endif
		ts.tv_sec = (time_sec > LONG_MAX) ? LONG_MAX : static_cast<long>(time_sec);

		return -pthread_cond_timedwait(&mCond, &mutex.mMutex, &ts);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ template<typename KEY, typename VALUE> inline
		ssize_t KeyedVector<KEY,VALUE>::replaceValueAt(size_t index, const VALUE& item) {
		if (index<size()) {
		mVector.editItemAt(index).value = item;
		return index;
		return static_cast<ssize_t>(index);
		}
		return BAD_INDEX;
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ typedef int (Looper_callbackFunc)(int fd, int events, void data);
		*/
		struct Message {
		Message() : what(0) { }
		Message(int what) : what(what) { }
		Message(int w) : what(w) { }

		/* The message type. (interpretation is left up to the handler) */
		int what;
		@@ -66,7 +66,7 @@ struct Message {
		*/
		class MessageHandler : public virtual RefBase {
		protected:
		virtual ~MessageHandler() { }
		virtual ~MessageHandler();

		public:
		/**
		@@ -97,7 +97,7 @@ private:
		*/
		class LooperCallback : public virtual RefBase {
		protected:
		virtual ~LooperCallback() { }
		virtual ~LooperCallback();

		public:
		/**
		@@ -436,8 +436,8 @@ private:
		struct MessageEnvelope {
		MessageEnvelope() : uptime(0) { }

		MessageEnvelope(nsecs_t uptime, const sp<MessageHandler> handler,
		const Message& message) : uptime(uptime), handler(handler), message(message) {
		MessageEnvelope(nsecs_t u, const sp<MessageHandler> h,
		const Message& m) : uptime(u), handler(h), message(m) {
		}

		nsecs_t uptime;

+1 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ LruCache<TKey, TValue>::LruCache(uint32_t maxCapacity)
		, mOldest(NULL)
		, mYoungest(NULL)
		, mMaxCapacity(maxCapacity)
		, mNullValue(NULL) {
		, mNullValue(0) {
		mSet->max_load_factor(1.0);
		};