This is an archive of the discontinued Mercurial Phabricator instance.

Differential D681

cstore: py-datapackstore build bug fix
ClosedPublic

Authored by ms2316 on Sep 11 2017, 2:12 PM.
Tags
None
Subscribers
None

Details

Reviewers
simonfar
durham
Group Reviewers
Restricted Project
Commits
rFBHGX3cec84f1cbab: cstore: py-datapackstore build bug fix
Summary

Build failed because there were no brackets in switch statement

Test Plan
  • Rebuild and ensure unit tests pass

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ms2316 created this revision.Sep 11 2017, 2:12 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 11 2017, 2:12 PM
simonfar accepted this revision.Sep 11 2017, 2:13 PM

Confirmed verbally that this was compiled on both macOS and CentOS.

This revision is now accepted and ready to land.Sep 11 2017, 2:13 PM
durham accepted this revision.Sep 11 2017, 4:36 PM
Closed by commit rFBHGX3cec84f1cbab: cstore: py-datapackstore build bug fix (authored by ms2316). · Explain WhySep 12 2017, 11:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcstore/py-datapackstore.h (18 lines)

Diff 1760

cstore/py-datapackstore.h

// A) We can decref them in case of an error. // A) We can decref them in case of an error.
// B) They don't get GC'd while the uniondatapackstore holds on to them. // B) They don't get GC'd while the uniondatapackstore holds on to them.
int iscdatapack = PyObject_IsInstance(item, (PyObject*)&datapackstoreType); int iscdatapack = PyObject_IsInstance(item, (PyObject*)&datapackstoreType);
PythonObj store(item); PythonObj store(item);
switch (iscdatapack) { switch (iscdatapack) {
case 1: case 1:
// Store is C datapack // Store is C datapack
{
cSubStores.push_back(store); cSubStores.push_back(store);
py_datapackstore *subStore = (py_datapackstore*)item; py_datapackstore *subStore = (py_datapackstore*)item;
stores.push_back(&subStore->datapackstore); stores.push_back(&subStore->datapackstore);
}
break; break;
case 0: case 0:
// Store is PythonDataStore, it's memory management // Store is PythonDataStore, it's memory management
// is performed by py_uniondatapackstore // is performed by py_uniondatapackstore
{
std::shared_ptr<PythonDataStore> pystore = std::shared_ptr<PythonDataStore> pystore =
std::make_shared<PythonDataStore>(store); std::make_shared<PythonDataStore>(store);
pySubStores.push_back(pystore); pySubStores.push_back(pystore);
stores.push_back(pystore.get()); stores.push_back(pystore.get());
}
break; break;
default: default:
// Error // Error
return -1; return -1;
} }
} }
// We have to manually call the member constructor, since the provided 'self' // We have to manually call the member constructor, since the provided 'self'