Skip to content

Commit 6d4d4f7

Browse files
committed
debug build fixes
1 parent 06a392f commit 6d4d4f7

5 files changed

Lines changed: 9 additions & 12 deletions

File tree

packages/arrow/package/ArrowDataFrame.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,8 @@ void encodeGeometry(const GeoDataFrame& dataframe, vector<shared_ptr<arrow::Arra
294294
string geoMetaData (const string& crs)
295295
{
296296
if (crs.empty()) throw RunTimeException(CRITICAL, RTE_FAILURE, "CRS is required");
297-
298-
const string geostr = R"({"version":"1.0.0","primary_column":"geometry","columns":{"geometry":{
297+
return R"({"version":"1.0.0","primary_column":"geometry","columns":{"geometry":{
299298
"encoding":"WKB","geometry_types":["Point"],"crs":)" + crs + R"(}}})";
300-
301-
return geostr;
302299
}
303300

304301
/*----------------------------------------------------------------------------

packages/core/package/GeoDataFrame.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1937,7 +1937,7 @@ int GeoDataFrame::luaDescribe (lua_State* L)
19371937
const char* description = getLuaString(L, 2);
19381938

19391939
// get open api string
1940-
string str = lua_obj->toOpenApi(description);
1940+
const string str = lua_obj->toOpenApi(description);
19411941

19421942
// return schema
19431943
lua_pushstring(L, str.c_str());

packages/core/package/LuaEndpoint.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,15 @@ bool LuaEndpoint::asyncHandler (Request* request, LuaEngine* engine, const endpo
179179
}
180180

181181
/* Build Receipt */
182-
UString response_id; // unique response id
182+
const UString response_id; // unique response id
183183
AlertMonitor alert_mon(NULL, INFO, async_rspq.getName());
184184
Asset* asset = dynamic_cast<Asset*>(LuaObject::getLuaObjectByName(SystemConfig::settings().stagingAsset.value.c_str(), Asset::OBJECT_TYPE));
185185
if(!asset) throw RunTimeException(CRITICAL, RTE_FAILURE, "Unable to access staging asset: %s", SystemConfig::settings().stagingAsset.value.c_str());
186186
const CredentialStore::Credential& credentials = CredentialStore::get(asset->getIdentity());
187-
FString receipt_filename("receipt-%s.txt", response_id.c_str());
187+
const FString receipt_filename("receipt-%s.txt", response_id.c_str());
188188

189189
/* Send Header and Async Response (as JSON) */
190-
FString response("{\"receipt\": \"s3://%s/%s\", \"endpoint\": \"%s\", \"parameters\": %s}", asset->getPath(), receipt_filename.c_str(), request->resource, endpoint.request_parameters->toJson().c_str());
190+
const FString response("{\"receipt\": \"s3://%s/%s\", \"endpoint\": \"%s\", \"parameters\": %s}", asset->getPath(), receipt_filename.c_str(), request->resource, endpoint.request_parameters->toJson().c_str());
191191
sendHeader(OK, content2str(JSON), &request->rspq, response.c_str(), response.size());
192192

193193
/* Terminate Connection */

packages/core/package/StringLib.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,15 @@ const char* StringLib::UniqueString::c_str(bool duplicate) const
160160
/*----------------------------------------------------------------------------
161161
* length - number of non-null characters in string
162162
*----------------------------------------------------------------------------*/
163-
long StringLib::UniqueString::length(void) const
163+
long StringLib::UniqueString::length(void)
164164
{
165165
return UUID_STR_LEN - 1; // remove null terminator in length
166166
}
167167

168168
/*----------------------------------------------------------------------------
169169
* size - alias for length
170170
*----------------------------------------------------------------------------*/
171-
long StringLib::UniqueString::size(void) const
171+
long StringLib::UniqueString::size(void)
172172
{
173173
return length();
174174
}

packages/core/package/StringLib.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ class StringLib
7373
~UniqueString (void) = default;
7474

7575
const char* c_str (bool duplicate = false) const;
76-
long length (void) const;
77-
long size (void) const;
76+
static long length (void);
77+
static long size (void);
7878

7979
private:
8080

0 commit comments

Comments
 (0)