[cig-commits] r14113 - in cs/spatialdata-0.1/trunk: libsrc/spatialdb modulesrc/spatialdb
brad at geodynamics.org
brad at geodynamics.org
Sat Feb 21 14:06:26 PST 2009
Author: brad
Date: 2009-02-21 14:06:25 -0800 (Sat, 21 Feb 2009)
New Revision: 14113
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/SimpleDBData.cc
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.hh
cs/spatialdata-0.1/trunk/modulesrc/spatialdb/CompositeDB.i
cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SimpleDBData.i
Log:
Fixed const inconsistencies in interfaces.
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.cc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.cc 2009-02-21 01:19:33 UTC (rev 14112)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.cc 2009-02-21 22:06:25 UTC (rev 14113)
@@ -69,7 +69,7 @@
// Set database A.
void
spatialdata::spatialdb::CompositeDB::dbA(SpatialDB* db,
- const char** names,
+ const char* const* names,
const int numNames)
{ // dbA
assert(0 != db);
@@ -106,7 +106,7 @@
// Set database B.
void
spatialdata::spatialdb::CompositeDB::dbB(SpatialDB* db,
- const char** names,
+ const char* const* names,
const int numNames)
{ // dbB
assert(0 != db);
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.hh 2009-02-21 01:19:33 UTC (rev 14112)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.hh 2009-02-21 22:06:25 UTC (rev 14113)
@@ -49,7 +49,7 @@
* @param numNames Size of array of names.
*/
void dbA(SpatialDB* db,
- const char** names,
+ const char* const* names,
const int numNames);
/** Set database B.
@@ -59,7 +59,7 @@
* @param numNames Size of array of names.
*/
void dbB(SpatialDB* db,
- const char** names,
+ const char* const* names,
const int numNames);
/// Open the database and prepare for querying.
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.cc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.cc 2009-02-21 01:19:33 UTC (rev 14112)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.cc 2009-02-21 22:06:25 UTC (rev 14113)
@@ -133,7 +133,7 @@
// ----------------------------------------------------------------------
// Set names of values.
void
-spatialdata::spatialdb::SimpleDBData::names(const char** const values,
+spatialdata::spatialdb::SimpleDBData::names(const char* const* values,
const int numValues)
{ // names
assert(0 != values);
@@ -146,7 +146,7 @@
// ----------------------------------------------------------------------
// Set units of values.
void
-spatialdata::spatialdb::SimpleDBData::units(const char** const values,
+spatialdata::spatialdb::SimpleDBData::units(const char* const* values,
const int numValues)
{ // units
assert(0 != values);
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.hh 2009-02-21 01:19:33 UTC (rev 14112)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.hh 2009-02-21 22:06:25 UTC (rev 14113)
@@ -78,7 +78,7 @@
* @param names Array of names of values [numValues].
* @param numValues Number of values.
*/
- void names(const char** const values,
+ void names(const char* const* values,
const int numValues);
/** Set units of values.
@@ -88,7 +88,7 @@
* @param units Array of units of values [numValues].
* @param numValues Number of values.
*/
- void units(const char** const values,
+ void units(const char* const* values,
const int numValues);
/** Get number of locations for data.
Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/CompositeDB.i
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/CompositeDB.i 2009-02-21 01:19:33 UTC (rev 14112)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/CompositeDB.i 2009-02-21 22:06:25 UTC (rev 14113)
@@ -42,14 +42,14 @@
* @param names Array of names of values to use with database.
* @param numNames Size of array of names.
*/
- %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 numNames)
};
void dbA(SpatialDB* db,
- const char** names,
+ const char* const* names,
const int numNames);
- %clear(const char** names, const int numNames);
+ %clear(const char* const* names, const int numNames);
/** Set database B.
*
@@ -57,14 +57,14 @@
* @param names Array of names of values to use with database.
* @param numNames Size of array of names.
*/
- %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 numNames)
};
void dbB(SpatialDB* db,
- const char** names,
+ const char* const* names,
const int numNames);
- %clear(const char** names, const int numNames);
+ %clear(const char* const* names, const int numNames);
/// Open the database and prepare for querying.
void open(void);
Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SimpleDBData.i
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SimpleDBData.i 2009-02-21 01:19:33 UTC (rev 14112)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/SimpleDBData.i 2009-02-21 22:06:25 UTC (rev 14113)
@@ -85,13 +85,13 @@
* @param values Array of names of values [numValues].
* @param numValues Number of values.
*/
- %apply(const char** string_list, const int list_len){
- (const char** const values,
+ %apply(const char* const* string_list, const int list_len){
+ (const char* const* values,
const int numValues)
};
- void names(const char** const values,
+ void names(const char* const* values,
const int numValues);
- %clear(const char** const values, const int numValues);
+ %clear(const char* const* values, const int numValues);
/** Set units of values.
*
@@ -100,13 +100,13 @@
* @param values Array of units of values [numValues].
* @param numValues Number of values.
*/
- %apply(const char** string_list, const int list_len){
- (const char** const values,
+ %apply(const char* const* string_list, const int list_len){
+ (const char* const* values,
const int numValues)
};
- void units(const char** const values,
+ void units(const char* const* values,
const int numValues);
- %clear(const char** const values, const int numValues);
+ %clear(const char* const* values, const int numValues);
/** Get number of locations for data.
*
More information about the CIG-COMMITS
mailing list