diff options
author | Max Kellermann <max@musicpd.org> | 2018-01-17 12:17:41 +0100 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2018-01-17 12:17:41 +0100 |
commit | bbc5212436021cd76f173ce60d7f0d95411d3319 (patch) | |
tree | a6b517c25799913d4cf7f3b5fbc95d143a9a53e3 /src/android | |
parent | c4f7740b800c49ad119e5d70335ea51a666e0114 (diff) |
fs/AllocatedPath: make the nullptr_t constructor public
Diffstat (limited to 'src/android')
-rw-r--r-- | src/android/Context.cxx | 2 | ||||
-rw-r--r-- | src/android/Environment.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/android/Context.cxx b/src/android/Context.cxx index 8964286f4..4d81180fb 100644 --- a/src/android/Context.cxx +++ b/src/android/Context.cxx @@ -36,7 +36,7 @@ Context::GetCacheDir(JNIEnv *env) const jobject file = env->CallObjectMethod(Get(), method); if (file == nullptr) { env->ExceptionClear(); - return AllocatedPath::Null(); + return nullptr; } return Java::File::ToAbsolutePath(env, file); diff --git a/src/android/Environment.cxx b/src/android/Environment.cxx index 415c0447f..93aadd7e4 100644 --- a/src/android/Environment.cxx +++ b/src/android/Environment.cxx @@ -60,7 +60,7 @@ Environment::getExternalStorageDirectory() env->CallStaticObjectMethod(cls, getExternalStorageDirectory_method); if (file == nullptr) - return AllocatedPath::Null(); + return nullptr; return Java::File::ToAbsolutePath(env, file); } @@ -70,7 +70,7 @@ Environment::getExternalStoragePublicDirectory(const char *type) { if (getExternalStoragePublicDirectory_method == nullptr) /* needs API level 8 */ - return AllocatedPath::Null(); + return nullptr; JNIEnv *env = Java::GetEnv(); @@ -79,7 +79,7 @@ Environment::getExternalStoragePublicDirectory(const char *type) Environment::getExternalStoragePublicDirectory_method, type2.Get()); if (file == nullptr) - return AllocatedPath::Null(); + return nullptr; return Java::File::ToAbsolutePath(env, file); } |