diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-12-12 01:36:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-12 01:36:19 +0000 |
| commit | 19031d51ab9edfc3b1996891d654a6b86ca937c0 (patch) | |
| tree | 8fab5f25e718fb218699b15a8197606e2e6f8322 | |
| parent | 8755359a35a4aa915fe3753633015263c7e97b74 (diff) | |
| parent | 45c1165558eb8f9c81843b63ed362079a60c8387 (diff) | |
| download | art-19031d51ab9edfc3b1996891d654a6b86ca937c0.zip art-19031d51ab9edfc3b1996891d654a6b86ca937c0.tar.gz art-19031d51ab9edfc3b1996891d654a6b86ca937c0.tar.bz2 | |
Merge "Define missing static constexpr variables"
| -rw-r--r-- | compiler/dex/arena_allocator.cc | 1 | ||||
| -rw-r--r-- | compiler/dex/quick/dex_file_method_inliner.cc | 1 | ||||
| -rw-r--r-- | runtime/base/timing_logger.cc | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/compiler/dex/arena_allocator.cc b/compiler/dex/arena_allocator.cc index 95e44b3..132831c 100644 --- a/compiler/dex/arena_allocator.cc +++ b/compiler/dex/arena_allocator.cc @@ -28,6 +28,7 @@ namespace art { static constexpr bool kUseMemMap = false; static constexpr bool kUseMemSet = true && kUseMemMap; static constexpr size_t kValgrindRedZoneBytes = 8; +constexpr size_t Arena::kDefaultSize; static const char* alloc_names[ArenaAllocator::kNumAllocKinds] = { "Misc ", diff --git a/compiler/dex/quick/dex_file_method_inliner.cc b/compiler/dex/quick/dex_file_method_inliner.cc index fb471ab..b21e37e 100644 --- a/compiler/dex/quick/dex_file_method_inliner.cc +++ b/compiler/dex/quick/dex_file_method_inliner.cc @@ -22,6 +22,7 @@ namespace art { +const uint32_t DexFileMethodInliner::kIndexUnresolved; const char* DexFileMethodInliner::kClassCacheNames[] = { "Z", // kClassCacheBoolean "B", // kClassCacheByte diff --git a/runtime/base/timing_logger.cc b/runtime/base/timing_logger.cc index bb32b2d..fe18f66 100644 --- a/runtime/base/timing_logger.cc +++ b/runtime/base/timing_logger.cc @@ -31,6 +31,8 @@ namespace art { +constexpr size_t CumulativeLogger::kLowMemoryBucketCount; +constexpr size_t CumulativeLogger::kDefaultBucketCount; CumulativeLogger::CumulativeLogger(const std::string& name) : name_(name), lock_name_("CumulativeLoggerLock" + name), |