[llvm-commits] CVS: llvm-java/lib/Compiler/VMClass.cpp

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/Compiler:

VMClass.cpp updated: 1.44 -> 1.45
---
Log message:

Make constants' names consistent.


---
Diffs of the changes:  (+9 -9)

 VMClass.cpp |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)


Index: llvm-java/lib/Compiler/VMClass.cpp
diff -u llvm-java/lib/Compiler/VMClass.cpp:1.44 llvm-java/lib/Compiler/VMClass.cpp:1.45
--- llvm-java/lib/Compiler/VMClass.cpp:1.44	Tue Apr 19 02:11:07 2005
+++ llvm-java/lib/Compiler/VMClass.cpp	Tue Apr 19 02:17:40 2005
@@ -37,7 +37,7 @@
     false,
     GlobalVariable::ExternalLinkage,
     NULL,
-    getName() + "<classRecord>",
+    getName() + "<class_record>",
     resolver_->getModule());
 }
 
@@ -205,7 +205,7 @@
       true,
       GlobalVariable::ExternalLinkage,
       ConstantArray::get(superClassRecordsType, init),
-      getName() + "<superClassRecords>",
+      getName() + "<super_class_records>",
       resolver_->getModule()));
 }
 
@@ -241,7 +241,7 @@
       true,
       GlobalVariable::ExternalLinkage,
       classRecordInit,
-      getName() + '+' + interface->getName() + "<classRecord>",
+      getName() + '+' + interface->getName() + "<class_record>",
       resolver_->getModule()),
     resolver_->getClassRecordPtrType());
 }
@@ -280,7 +280,7 @@
       true,
       GlobalVariable::ExternalLinkage,
       ConstantArray::get(interfaceClassRecordsType, init),
-      getName() + "<interfaceClassRecords>",
+      getName() + "<interface_class_records>",
       resolver_->getModule()));
 }
 
@@ -319,7 +319,7 @@
       true,
       GlobalVariable::ExternalLinkage,
       ConstantArray::get(arrayType, init),
-      getName() + "<fielddescriptors>",
+      getName() + "<field_descriptors>",
       resolver_->getModule()));
 }
 
@@ -341,7 +341,7 @@
       true,
       GlobalVariable::ExternalLinkage,
       ConstantArray::get(arrayType, init),
-      getName() + "<fieldoffsets>",
+      getName() + "<field_offsets>",
       resolver_->getModule()));
 }
 
@@ -366,7 +366,7 @@
       true,
       GlobalVariable::ExternalLinkage,
       ConstantArray::get(arrayType, init),
-      getName() + "<staticfielddescriptors>",
+      getName() + "<static_field_descriptors>",
       resolver_->getModule()));
 }
 
@@ -389,7 +389,7 @@
       true,
       GlobalVariable::ExternalLinkage,
       ConstantArray::get(arrayType, init),
-      getName() + "<staticfieldpointers>",
+      getName() + "<static_field_pointers>",
       resolver_->getModule()));
 }
 
@@ -447,7 +447,7 @@
         if (method->isPrivate() || method->isStatic() || name[0] == '<') {
           MethodMap::iterator i =
             methodMap_.insert(
-              std::make_pair(name + descriptor, VMMethod(this, method)));
+              std::make_pair(name + descriptor, VMMethod(this, method))).first;
           staticMethods_.push_back(&i->second);
         }
         // Otherwise we need to assign an index for it and update the