diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-28 16:44:39 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-28 16:44:39 +0000 |
| commit | 56a3380b46f406ffaf093405ac2db4515b0a4f80 (patch) | |
| tree | e9e4c5553343f27e41d862c49b21fd69bf5161b9 /nGenEx/ParseUtil.cpp | |
| parent | 41b40af36198fb013a2034a1954bbc4df50fea8b (diff) | |
| download | starshatter-56a3380b46f406ffaf093405ac2db4515b0a4f80.zip starshatter-56a3380b46f406ffaf093405ac2db4515b0a4f80.tar.gz starshatter-56a3380b46f406ffaf093405ac2db4515b0a4f80.tar.bz2 | |
Removes the ArrayList classes, and replaces all instances with std::vector implementations.
Diffstat (limited to 'nGenEx/ParseUtil.cpp')
| -rw-r--r-- | nGenEx/ParseUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nGenEx/ParseUtil.cpp b/nGenEx/ParseUtil.cpp index 6e64e39..01e8370 100644 --- a/nGenEx/ParseUtil.cpp +++ b/nGenEx/ParseUtil.cpp @@ -390,7 +390,7 @@ bool GetDefArray(double* dst, int size, TermDef* def, const char* file) // +--------------------------------------------------------------------+
-bool GetDefArray(ArrayList& array, TermDef* def, const char* file)
+bool GetDefArray(std::vector<DWORD>& array, TermDef* def, const char* file)
{
if (!def || !def->term()) {
Print("WARNING: missing ARRAY TermDef in '%s'\n", file);
@@ -404,7 +404,7 @@ bool GetDefArray(ArrayList& array, TermDef* def, const char* file) array.clear();
for (int i = 0; i < nelem; i++)
- array.append((DWORD) (val->elements()->at(i)->isNumber()->value()));
+ array.push_back((DWORD) (val->elements()->at(i)->isNumber()->value()));
return true;
}
@@ -415,7 +415,7 @@ bool GetDefArray(ArrayList& array, TermDef* def, const char* file) return false;
}
-bool GetDefArray(FloatList& array, TermDef* def, const char* file)
+bool GetDefArray(std::vector<float>& array, TermDef* def, const char* file)
{
if (!def || !def->term()) {
Print("WARNING: missing ARRAY TermDef in '%s'\n", file);
@@ -429,7 +429,7 @@ bool GetDefArray(FloatList& array, TermDef* def, const char* file) array.clear();
for (int i = 0; i < nelem; i++)
- array.append((float) (val->elements()->at(i)->isNumber()->value()));
+ array.push_back((float) (val->elements()->at(i)->isNumber()->value()));
return true;
}
|