Skip to content

Commit 003218e

Browse files
committed
Rearrange some code
1 parent dd11c6e commit 003218e

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

src/monodroid/jni/embedded-assemblies.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,6 @@ EmbeddedAssemblies::assembly_store_open_from_bundles (dynamic_local_string<SENSI
357357
len -= sizeof(SharedConstants::DLL_EXTENSION) - 1;
358358
}
359359

360-
std::string clipped_name;
361-
clipped_name.assign (name.get (), len);
362-
log_info (LOG_ASSEMBLY, "Clipped name: %s", clipped_name.c_str ());
363-
364360
hash_t name_hash = xxhash::hash (name.get (), len);
365361
log_debug (LOG_ASSEMBLY, "assembly_store_open_from_bundles: looking for bundled name: '%s' (hash 0x%zx)", name.get (), name_hash);
366362

src/monodroid/jni/embedded-assemblies.hh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@
44

55
#include <array>
66

7-
#undef HAVE_CONCEPTS
8-
9-
// Xcode has supports for concepts only since 12.5
10-
#if __has_include (<concepts>)
11-
#define HAVE_CONCEPTS
12-
#include <concepts>
13-
#endif // __has_include
14-
157
#include <cerrno>
168
#include <cstring>
179
#include <limits>
@@ -33,6 +25,14 @@
3325
#include "shared-constants.hh"
3426
#include "xxhash.hh"
3527

28+
#undef HAVE_CONCEPTS
29+
30+
// Xcode has supports for concepts only since 12.5
31+
#if __has_include (<concepts>)
32+
#define HAVE_CONCEPTS
33+
#include <concepts>
34+
#endif // __has_include
35+
3636
struct TypeMapHeader;
3737

3838
namespace xamarin::android::internal {

0 commit comments

Comments
 (0)