[cig-commits] r14062 - in cs/spatialdata-0.1/trunk: libsrc/spatialdb modulesrc/include modulesrc/spatialdb
brad at geodynamics.org
brad at geodynamics.org
Tue Feb 17 15:28:34 PST 2009
Author: brad
Date: 2009-02-17 15:28:34 -0800 (Tue, 17 Feb 2009)
New Revision: 14062
Modified:
cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.cc
cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/GravityField.cc
cs/spatialdata-0.1/trunk/libsrc/spatialdb/GravityField.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.cc
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDB.cc
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDB.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.cc
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SpatialDB.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/UniformDB.cc
cs/spatialdata-0.1/trunk/libsrc/spatialdb/UniformDB.hh
cs/spatialdata-0.1/trunk/modulesrc/include/chararray.i
cs/spatialdata-0.1/trunk/modulesrc/spatialdb/CompositeDB.i
cs/spatialdata-0.1/trunk/modulesrc/spatialdb/GravityField.i
cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SCECCVMH.i
cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SimpleDB.i
cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SpatialDBObj.i
cs/spatialdata-0.1/trunk/modulesrc/spatialdb/UniformDB.i
Log:
Changed const char** to const char* const*.
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.cc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.cc 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.cc 2009-02-17 23:28:34 UTC (rev 14062)
@@ -170,7 +170,7 @@
// ----------------------------------------------------------------------
// Set values to be returned by queries.
void
-spatialdata::spatialdb::CompositeDB::queryVals(const char** names,
+spatialdata::spatialdb::CompositeDB::queryVals(const char* const* names,
const int numVals)
{ // queryVals
assert(0 != _dbA);
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.hh 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.hh 2009-02-17 23:28:34 UTC (rev 14062)
@@ -75,7 +75,7 @@
* @param names Names of values to be returned in queries
* @param numVals Number of values to be returned in queries
*/
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals);
/** Query the database.
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/GravityField.cc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/GravityField.cc 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/GravityField.cc 2009-02-17 23:28:34 UTC (rev 14062)
@@ -75,8 +75,8 @@
// ----------------------------------------------------------------------
// Set values to be returned by queries.
void
-spatialdata::spatialdb::GravityField::queryVals(const char** names,
- const int numVals)
+spatialdata::spatialdb::GravityField::queryVals(const char* const* names,
+ const int numVals)
{ // queryVals
if (0 == numVals) {
std::ostringstream msg;
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/GravityField.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/GravityField.hh 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/GravityField.hh 2009-02-17 23:28:34 UTC (rev 14062)
@@ -66,7 +66,7 @@
* @param names Names of values to be returned in queries
* @param numVals Number of values to be returned in queries
*/
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals);
/** Query the database.
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.cc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.cc 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.cc 2009-02-17 23:28:34 UTC (rev 14062)
@@ -161,7 +161,7 @@
// ----------------------------------------------------------------------
// Set values to be returned by queries.
void
-spatialdata::spatialdb::SCECCVMH::queryVals(const char** names,
+spatialdata::spatialdb::SCECCVMH::queryVals(const char* const* names,
const int numVals)
{ // queryVals
if (0 == numVals) {
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.hh 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.hh 2009-02-17 23:28:34 UTC (rev 14062)
@@ -66,7 +66,7 @@
* @param names Names of values to be returned in queries
* @param numVals Number of values to be returned in queries
*/
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals);
/** Query the database.
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDB.cc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDB.cc 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDB.cc 2009-02-17 23:28:34 UTC (rev 14062)
@@ -98,7 +98,7 @@
// ----------------------------------------------------------------------
// Set values to be returned by queries.
void
-spatialdata::spatialdb::SimpleDB::queryVals(const char** names,
+spatialdata::spatialdb::SimpleDB::queryVals(const char* const* names,
const int numVals)
{ // queryVals
if (0 == _query) {
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDB.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDB.hh 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDB.hh 2009-02-17 23:28:34 UTC (rev 14062)
@@ -80,7 +80,7 @@
* @param names Names of values to be returned in queries
* @param numVals Number of values to be returned in queries
*/
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals);
/** Set the I/O handler.
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.cc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.cc 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.cc 2009-02-17 23:28:34 UTC (rev 14062)
@@ -62,7 +62,7 @@
// ----------------------------------------------------------------------
// Set values to be returned by queries.
void
-spatialdata::spatialdb::SimpleDBQuery::queryVals(const char** names,
+spatialdata::spatialdb::SimpleDBQuery::queryVals(const char* const* names,
const int numVals)
{ // queryVals
assert(0 != _db._data);
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.hh 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.hh 2009-02-17 23:28:34 UTC (rev 14062)
@@ -50,7 +50,7 @@
* @param names Names of values to be returned in queries
* @param numVals Number of values to be returned in queries
*/
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals);
/** Query the database.
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SpatialDB.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SpatialDB.hh 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SpatialDB.hh 2009-02-17 23:28:34 UTC (rev 14062)
@@ -69,7 +69,7 @@
* @param numVals Number of values to be returned in queries
*/
virtual
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals) = 0;
/** Query the database.
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/UniformDB.cc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/UniformDB.cc 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/UniformDB.cc 2009-02-17 23:28:34 UTC (rev 14062)
@@ -58,7 +58,7 @@
// ----------------------------------------------------------------------
// Set values in database.
void
-spatialdata::spatialdb::UniformDB::setData(const char** names,
+spatialdata::spatialdb::UniformDB::setData(const char* const* names,
const double* values,
const int numValues)
{ // setData
@@ -84,7 +84,7 @@
// ----------------------------------------------------------------------
// Set values to be returned by queries.
void
-spatialdata::spatialdb::UniformDB::queryVals(const char** names,
+spatialdata::spatialdb::UniformDB::queryVals(const char* const* names,
const int numVals)
{ // queryVals
if (0 == numVals) {
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/UniformDB.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/UniformDB.hh 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/UniformDB.hh 2009-02-17 23:28:34 UTC (rev 14062)
@@ -48,7 +48,7 @@
* @param values Array of values in database.
* @param numValues Number of values in database.
*/
- void setData(const char** names,
+ void setData(const char* const* names,
const double* values,
const int numValues);
@@ -65,7 +65,7 @@
* @param names Names of values to be returned in queries
* @param numVals Number of values to be returned in queries
*/
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals);
/** Query the database.
Modified: cs/spatialdata-0.1/trunk/modulesrc/include/chararray.i
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/include/chararray.i 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/modulesrc/include/chararray.i 2009-02-17 23:28:34 UTC (rev 14062)
@@ -10,8 +10,8 @@
// ======================================================================
//
-// Treat const char** as a special case.
-%typemap(in) (const char** string_list) {
+// Treat const char* const* as a special case.
+%typemap(in) (const char* const* string_list) {
// Check to make sure input is a list.
if (PyList_Check($input)) {
const int size = PyList_Size($input);
@@ -30,16 +30,16 @@
PyErr_SetString(PyExc_TypeError, "Expected list of strings.");
return NULL;
} // if/else
-} // typemap(in) const char**
+} // typemap(in) const char* const*
// This cleans up the char** array we malloc'd before the function call
-%typemap(freearg) (const char** string_list) {
+%typemap(freearg) (const char* const* string_list) {
delete[] $1;
}
-// Treat const char** as a special case.
-%typemap(in) (const char** string_list, const int list_len) {
+// Treat const char* const* as a special case.
+%typemap(in) (const char* const* string_list, const int list_len) {
// Check to make sure input is a list.
if (PyList_Check($input)) {
const int size = PyList_Size($input);
@@ -59,10 +59,10 @@
PyErr_SetString(PyExc_TypeError, "Expected list of strings.");
return NULL;
} // if/else
-} // typemap(in) const char**
+} // typemap(in) const char* const*
// This cleans up the char** array we malloc'd before the function call
-%typemap(freearg) (const char** string_list, const int list_len) {
+%typemap(freearg) (const char* const* string_list, const int list_len) {
delete[] $1;
}
Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/CompositeDB.i
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/CompositeDB.i 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/CompositeDB.i 2009-02-17 23:28:34 UTC (rev 14062)
@@ -79,13 +79,13 @@
* @param names Names of values to be returned in queries
* @param numVals Number of values to be returned in queries
*/
- %apply(const char** string_list, const int list_len){
- (const char** names,
+ %apply(const char* const* string_list, const int list_len){
+ (const char* const* names,
const int numVals)
};
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals);
- %clear(const char** names, const int numVals);
+ %clear(const char* const* names, const int numVals);
/** Query the database.
*
Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/GravityField.i
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/GravityField.i 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/GravityField.i 2009-02-17 23:28:34 UTC (rev 14062)
@@ -66,13 +66,13 @@
* @param names Names of values to be returned in queries
* @param numVals Number of values to be returned in queries
*/
- %apply(const char** string_list, const int list_len){
- (const char** names,
+ %apply(const char* const* string_list, const int list_len){
+ (const char* const* names,
const int numVals)
};
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals);
- %clear(const char** names, const int numVals);
+ %clear(const char* const* names, const int numVals);
/** Query the database.
*
Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SCECCVMH.i
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SCECCVMH.i 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SCECCVMH.i 2009-02-17 23:28:34 UTC (rev 14062)
@@ -22,7 +22,7 @@
namespace spatialdb {
- class SCECCVMH : SpatialDB
+ class SCECCVMH : public SpatialDB
{ // SCECCVMH
public :
@@ -70,13 +70,13 @@
* @param names Names of values to be returned in queries
* @param numVals Number of values to be returned in queries
*/
- %apply(const char** string_list, const int list_len){
- (const char** names,
+ %apply(const char* const* string_list, const int list_len){
+ (const char* const* names,
const int numVals)
};
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals);
- %clear(const char** names, const int numVals);
+ %clear(const char* const* names, const int numVals);
/** Query the database.
*
Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SimpleDB.i
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SimpleDB.i 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SimpleDB.i 2009-02-17 23:28:34 UTC (rev 14062)
@@ -75,13 +75,13 @@
* @param names Names of values to be returned in queries
* @param numVals Number of values to be returned in queries
*/
- %apply(const char** string_list, const int list_len){
- (const char** names,
+ %apply(const char* const* string_list, const int list_len){
+ (const char* const* names,
const int numVals)
};
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals);
- %clear(const char** names, const int numVals);
+ %clear(const char* const* names, const int numVals);
/** Set the I/O handler.
*
Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SpatialDBObj.i
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SpatialDBObj.i 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SpatialDBObj.i 2009-02-17 23:28:34 UTC (rev 14062)
@@ -68,14 +68,14 @@
* @param names Names of values to be returned in queries
* @param numVals Number of values to be returned in queries
*/
- %apply(const char** string_list, const int list_len){
- (const char** names,
+ %apply(const char* const* string_list, const int list_len){
+ (const char* const* names,
const int numVals)
};
virtual
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals) = 0;
- %clear(const char** names, const int numVals);
+ %clear(const char* const* names, const int numVals);
/** Query the database.
*
Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/UniformDB.i
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/UniformDB.i 2009-02-17 20:46:52 UTC (rev 14061)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/UniformDB.i 2009-02-17 23:28:34 UTC (rev 14062)
@@ -42,16 +42,17 @@
* @param values Array of values in database.
* @param numValues Number of values in database.
*/
- %apply(const char** string_list) {
- (const char** names)
+ %apply(const char* const* string_list) {
+ (const char* const* names)
};
%apply(double* IN_ARRAY1, int DIM1) {
(const double* values,
const int numValues)
};
- void setData(const char** names,
+ void setData(const char* const* names,
const double* values,
const int numValues);
+ %clear(const char* const* names);
%clear(const double* values, const int numValues);
/// Open the database and prepare for querying.
@@ -67,13 +68,13 @@
* @param names Names of values to be returned in queries
* @param numVals Number of values to be returned in queries
*/
- %apply(const char** string_list, const int list_len){
- (const char** names,
+ %apply(const char* const* string_list, const int list_len){
+ (const char* const* names,
const int numVals)
};
- void queryVals(const char** names,
+ void queryVals(const char* const* names,
const int numVals);
- %clear(const char** names, const int numVals);
+ %clear(const char* const* names, const int numVals);
/** Query the database.
*
More information about the CIG-COMMITS
mailing list