← Back to branch summary

~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

Viewing changes to 3rd_party/android-deps/utils/RefBase.h

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
3rd_party/android-deps/utils/RefBase.h
17
17
#ifndef ANDROID_REF_BASE_H
18
18
#define ANDROID_REF_BASE_H
19
19
 
20
 
#include <androidfw/Platform.h>
21
20
 
22
 
#include ANDROIDFW_CUTILS(atomic.h)
 
21
#include <std/atomic.h>
23
22
 
24
23
#include <stdint.h>
25
24
#include <sys/types.h>
26
25
#include <stdlib.h>
27
26
#include <string.h>
28
27
 
29
 
#include ANDROIDFW_UTILS(StrongPointer.h)
30
 
#include ANDROIDFW_UTILS(TypeHelpers.h)
 
28
#include <std/StrongPointer.h>
 
29
#include <std/TypeHelpers.h>
31
30
 
32
31
// ---------------------------------------------------------------------------
33
32
namespace android {