From e1f852158ae26dfb265bb736ff1960c90793fca7 Mon Sep 17 00:00:00 2001
From: "jiseob.jang" <jiseob.jang@samsung.com>
Date: Thu, 1 Feb 2018 15:39:40 +0900
Subject: [PATCH] Fix problems caused by using other kinds of standard
 libraries.

- change including atomic.h to including catomic.
- change including sched.h to including linux/sched.h.
- add including cstdint, vector, cstring.
- add defining SIZE_T_MAX.

Signed-off-by: jiseob.jang <jiseob.jang@samsung.com>
---
 experiments/android_nn/nn/common/include/ActivationFunctor.h         | 2 ++
 .../android_nn/nn/depend/android-base/include/android-base/logging.h | 2 ++
 experiments/android_nn/nn/depend/libcutils/include/cutils/atomic.h   | 5 +++++
 experiments/android_nn/nn/depend/libcutils/include/cutils/trace.h    | 5 +++++
 experiments/android_nn/nn/depend/libcutils/sched_policy.cpp          | 1 +
 experiments/android_nn/nn/depend/libhidl/base/Status.cpp             | 1 +
 experiments/android_nn/nn/depend/libhwbinder/Binder.cpp              | 2 +-
 experiments/android_nn/nn/depend/libhwbinder/IPCThreadState.cpp      | 2 +-
 experiments/android_nn/nn/depend/libhwbinder/Parcel.cpp              | 1 +
 .../android_nn/nn/depend/libhwbinder/include/hwbinder/Binder.h       | 1 +
 10 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/experiments/android_nn/nn/common/include/ActivationFunctor.h b/experiments/android_nn/nn/common/include/ActivationFunctor.h
index fb966c4..c87fb72 100644
--- a/experiments/android_nn/nn/common/include/ActivationFunctor.h
+++ b/experiments/android_nn/nn/common/include/ActivationFunctor.h
@@ -21,6 +21,8 @@
 
 #include <algorithm>
 #include <cmath>
+#include <vector>
+#include <cstdint>
 
 enum ActivationFn {
     kActivationNone = 0,
diff --git a/experiments/android_nn/nn/depend/android-base/include/android-base/logging.h b/experiments/android_nn/nn/depend/android-base/include/android-base/logging.h
index 548b286..f9dfb97 100644
--- a/experiments/android_nn/nn/depend/android-base/include/android-base/logging.h
+++ b/experiments/android_nn/nn/depend/android-base/include/android-base/logging.h
@@ -60,6 +60,8 @@
 #include <functional>
 #include <memory>
 #include <ostream>
+#include <cstdint>
+#include <vector>
 
 #include "android-base/macros.h"
 
diff --git a/experiments/android_nn/nn/depend/libcutils/include/cutils/atomic.h b/experiments/android_nn/nn/depend/libcutils/include/cutils/atomic.h
index 0c88bfe..6f8df41 100644
--- a/experiments/android_nn/nn/depend/libcutils/include/cutils/atomic.h
+++ b/experiments/android_nn/nn/depend/libcutils/include/cutils/atomic.h
@@ -19,7 +19,12 @@
 
 #include <stdint.h>
 #include <sys/types.h>
+#ifdef __cplusplus
+#include <atomic>
+using namespace std;
+#else
 #include <stdatomic.h>
+#endif
 
 #ifndef ANDROID_ATOMIC_INLINE
 #define ANDROID_ATOMIC_INLINE static inline
diff --git a/experiments/android_nn/nn/depend/libcutils/include/cutils/trace.h b/experiments/android_nn/nn/depend/libcutils/include/cutils/trace.h
index fcbdc9b..4281375 100644
--- a/experiments/android_nn/nn/depend/libcutils/include/cutils/trace.h
+++ b/experiments/android_nn/nn/depend/libcutils/include/cutils/trace.h
@@ -18,7 +18,12 @@
 #define _LIBS_CUTILS_TRACE_H
 
 #include <inttypes.h>
+#ifdef __cplusplus
+#include <atomic>
+using namespace std;
+#else
 #include <stdatomic.h>
+#endif
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/experiments/android_nn/nn/depend/libcutils/sched_policy.cpp b/experiments/android_nn/nn/depend/libcutils/sched_policy.cpp
index b00fa85..b272207 100644
--- a/experiments/android_nn/nn/depend/libcutils/sched_policy.cpp
+++ b/experiments/android_nn/nn/depend/libcutils/sched_policy.cpp
@@ -41,6 +41,7 @@ static inline SchedPolicy _policy(SchedPolicy p)
 
 #include <pthread.h>
 #include <sched.h>
+#include <linux/sched.h>
 #include <sys/prctl.h>
 
 #define POLICY_DEBUG 0
diff --git a/experiments/android_nn/nn/depend/libhidl/base/Status.cpp b/experiments/android_nn/nn/depend/libhidl/base/Status.cpp
index 3b31ee6..90b79b0 100644
--- a/experiments/android_nn/nn/depend/libhidl/base/Status.cpp
+++ b/experiments/android_nn/nn/depend/libhidl/base/Status.cpp
@@ -20,6 +20,7 @@
 #include <hidl/Status.h>
 
 #include <unordered_map>
+#include <cstring>
 
 namespace android {
 namespace hardware {
diff --git a/experiments/android_nn/nn/depend/libhwbinder/Binder.cpp b/experiments/android_nn/nn/depend/libhwbinder/Binder.cpp
index 3cb36ce..7b18777 100644
--- a/experiments/android_nn/nn/depend/libhwbinder/Binder.cpp
+++ b/experiments/android_nn/nn/depend/libhwbinder/Binder.cpp
@@ -22,7 +22,7 @@
 #include <hwbinder/IInterface.h>
 #include <hwbinder/Parcel.h>
 
-#include <sched.h>
+#include <linux/sched.h>
 #include <stdio.h>
 
 namespace android {
diff --git a/experiments/android_nn/nn/depend/libhwbinder/IPCThreadState.cpp b/experiments/android_nn/nn/depend/libhwbinder/IPCThreadState.cpp
index 295861e..13b18cd 100644
--- a/experiments/android_nn/nn/depend/libhwbinder/IPCThreadState.cpp
+++ b/experiments/android_nn/nn/depend/libhwbinder/IPCThreadState.cpp
@@ -38,7 +38,7 @@ namespace android {
 #include <errno.h>
 #include <inttypes.h>
 #include <pthread.h>
-#include <sched.h>
+#include <linux/sched.h>
 #include <signal.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
diff --git a/experiments/android_nn/nn/depend/libhwbinder/Parcel.cpp b/experiments/android_nn/nn/depend/libhwbinder/Parcel.cpp
index 05306ef..1ec69f1 100644
--- a/experiments/android_nn/nn/depend/libhwbinder/Parcel.cpp
+++ b/experiments/android_nn/nn/depend/libhwbinder/Parcel.cpp
@@ -70,6 +70,7 @@ namespace android {
 // use the wrapper function pad_size()
 #define PAD_SIZE_UNSAFE(s) (((s)+3)&~3)
 
+#define SIZE_T_MAX ((size_t) -1)
 static size_t pad_size(size_t s) {
     if (s > (SIZE_T_MAX - 3)) {
         abort();
diff --git a/experiments/android_nn/nn/depend/libhwbinder/include/hwbinder/Binder.h b/experiments/android_nn/nn/depend/libhwbinder/include/hwbinder/Binder.h
index 95c909c..dc49e52 100644
--- a/experiments/android_nn/nn/depend/libhwbinder/include/hwbinder/Binder.h
+++ b/experiments/android_nn/nn/depend/libhwbinder/include/hwbinder/Binder.h
@@ -19,6 +19,7 @@
 
 #include <atomic>
 #include <stdint.h>
+#include <linux/sched.h>
 #include <hwbinder/IBinder.h>
 
 // ---------------------------------------------------------------------------
-- 
2.7.4