commit 11d1b0c31ddd710d26068da8e0e4621002205b4b
author Elliott Hughes <enh@google.com> Mon Jan 23 16:57:47 2012 -0800
committer Elliott Hughes <enh@google.com> Mon Jan 23 17:26:10 2012 -0800
tree 8d9c9c0dd5741214466775b86069032d609fd91c
parent bbdb1437f55948e5395b4dcb306e25605539a444

Reduce namespace pollution.

This leaves us with just the mspace stuff and three libdex functions to clean
up. We deliberately expose the JII API, and I don't think there's anything we
can really do about the art_..._from_code stuff (and at least that starts with
"art_").

Change-Id: I77e58e8330cd2afeb496642302dfe3311e68091a

src/compiler/codegen/arm/Thumb2/Gen.cc

diff --git a/src/compiler/codegen/arm/Thumb2/Gen.cc b/src/compiler/codegen/arm/Thumb2/Gen.cc
index 0afbe41..9c4ef1e 100644
--- a/src/compiler/codegen/arm/Thumb2/Gen.cc
+++ b/src/compiler/codegen/arm/Thumb2/Gen.cc
@@ -33,14 +33,16 @@
 #define EXERCISE_RESOLVE_METHOD (cUnit->enableDebug & \
     (1 << kDebugExerciseResolveMethod))
 
+namespace art {
+
 STATIC RegLocation getRetLoc(CompilationUnit* cUnit);
 
 void warnIfUnresolved(CompilationUnit* cUnit, int fieldIdx, Field* field) {
   if (field == NULL) {
-    const art::DexFile::FieldId& field_id = cUnit->dex_file->GetFieldId(fieldIdx);
+    const DexFile::FieldId& field_id = cUnit->dex_file->GetFieldId(fieldIdx);
     std::string class_name(cUnit->dex_file->GetFieldDeclaringClassDescriptor(field_id));
     std::string field_name(cUnit->dex_file->GetFieldName(field_id));
-    LOG(INFO) << "Field " << art::PrettyDescriptor(class_name) << "." << field_name
+    LOG(INFO) << "Field " << PrettyDescriptor(class_name) << "." << field_name
               << " unresolved at compile time";
   } else {
     // We also use the slow path for wide volatile fields.
@@ -419,7 +421,7 @@
     loadCurrMethodDirect(cUnit, r1);              // arg1 <= Method*
     loadWordDisp(cUnit, r1,
                  Method::DexCacheResolvedFieldsOffset().Int32Value(), r0);
-    loadWordDisp(cUnit, r0, art::Array::DataOffset().Int32Value() +
+    loadWordDisp(cUnit, r0, Array::DataOffset().Int32Value() +
                  sizeof(int32_t*)* fieldIdx, r0);
     /*
      * For testing, omit the test for run-time resolution. This will
@@ -443,7 +445,7 @@
     oatFreeTemp(cUnit, r1);
     oatFreeTemp(cUnit, r2);
     oatFreeTemp(cUnit, r3);
-    loadWordDisp(cUnit, r0, art::Field::OffsetOffset().Int32Value(), r0);
+    loadWordDisp(cUnit, r0, Field::OffsetOffset().Int32Value(), r0);
 }
 
 STATIC void genIGet(CompilationUnit* cUnit, MIR* mir, OpSize size,
@@ -2108,3 +2110,5 @@
         LOG(INFO) << "dalvik.vm.oat.op = " << buf;
     }
 }
+
+}  // namespace art