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
diff --git a/src/compiler/Ralloc.cc b/src/compiler/Ralloc.cc
index 4e90382..c6375ee 100644
--- a/src/compiler/Ralloc.cc
+++ b/src/compiler/Ralloc.cc
@@ -19,6 +19,8 @@
#include "Dataflow.h"
#include "codegen/Ralloc.h"
+namespace art {
+
STATIC bool setFp(CompilationUnit* cUnit, int index, bool isFP) {
bool change = false;
if (cUnit->regLocation[index].highWord) {
@@ -264,7 +266,7 @@
*/
if ((definedFP && definedCore) &&
((cUnit->disableOpt & (1 << kPromoteRegs)) == 0)) {
- LOG(WARNING) << art::PrettyMethod(cUnit->method_idx, *cUnit->dex_file)
+ LOG(WARNING) << PrettyMethod(cUnit->method_idx, *cUnit->dex_file)
<< " op at block " << bb->id
<< " has both fp and core uses for same def.";
cUnit->disableOpt |= (1 << kPromoteRegs);
@@ -329,7 +331,7 @@
int numIns = cUnit->numIns;
if (numIns > 0) {
int sReg = numRegs - numIns;
- if ((cUnit->access_flags & art::kAccStatic) == 0) {
+ if ((cUnit->access_flags & kAccStatic) == 0) {
// For non-static, skip past "this"
cUnit->regLocation[sReg].defined = true;
cUnit->regLocation[sReg].core = true;
@@ -411,3 +413,5 @@
cUnit->insOffset = cUnit->frameSize + 4;
cUnit->regsOffset = (cUnit->numOuts + cUnit->numPadding + 1) * 4;
}
+
+} // namespace art