diff --git a/include/lsst/afw/table/BaseTable.h b/include/lsst/afw/table/BaseTable.h index 5d13dbc26..1c86f2b3d 100644 --- a/include/lsst/afw/table/BaseTable.h +++ b/include/lsst/afw/table/BaseTable.h @@ -30,12 +30,12 @@ namespace detail { * Table and Record classes. */ struct RecordData { - void * data; + void* data; std::shared_ptr table; ndarray::Manager::Ptr manager; }; -} // namespace detail +} // namespace detail /** * Base class for all tables. @@ -185,7 +185,6 @@ class BaseTable : public std::enable_shared_from_this { virtual ~BaseTable(); protected: - /** * Helper function that must be used by all _makeRecord overrides to * actually construct records. @@ -202,8 +201,8 @@ class BaseTable : public std::enable_shared_from_this { */ // n.b. this is implemented in BaseRecord.h, as it requires the BaseRecord // definition, and must go in a header. - template - std::shared_ptr constructRecord(Args && ...args); + template + std::shared_ptr constructRecord(Args&&... args); virtual void handleAliasChange(std::string const& alias) {} diff --git a/src/table/BaseTable.cc b/src/table/BaseTable.cc index bed28e3ef..13477493a 100644 --- a/src/table/BaseTable.cc +++ b/src/table/BaseTable.cc @@ -121,9 +121,7 @@ std::shared_ptr BaseTable::make(Schema const &schema) { return std::shared_ptr(new BaseTable(schema)); } -Schema BaseTable::makeMinimalSchema() { - return Schema(); -} +Schema BaseTable::makeMinimalSchema() { return Schema(); } std::shared_ptr BaseTable::copyRecord(BaseRecord const &input) { std::shared_ptr output = makeRecord(); @@ -145,9 +143,7 @@ std::shared_ptr BaseTable::_clone() const { return std::shared_ptr(new BaseTable(*this)); } -std::shared_ptr BaseTable::_makeRecord() { - return constructRecord(); -} +std::shared_ptr BaseTable::_makeRecord() { return constructRecord(); } BaseTable::BaseTable(Schema const &schema, std::shared_ptr metadata) : _schema(schema), _metadata(metadata) { @@ -190,9 +186,8 @@ struct RecordDestroyer { detail::RecordData BaseTable::_makeNewRecordData() { auto data = Block::get(_schema.getRecordSize(), _manager); return detail::RecordData{ - data, - shared_from_this(), - _manager // manager always points to the most recently-used block. + data, shared_from_this(), + _manager // manager always points to the most recently-used block. }; } diff --git a/tests/test_simpleTable.py b/tests/test_simpleTable.py index 124b4cd86..a72839471 100644 --- a/tests/test_simpleTable.py +++ b/tests/test_simpleTable.py @@ -19,14 +19,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -""" -Tests for table.SimpleTable - -Run with: - python test_simpleTable.py -or - pytest test_simpleTable.py -""" import os.path import unittest diff --git a/tests/test_sourceTable.py b/tests/test_sourceTable.py index 57aae693e..96a43a43d 100644 --- a/tests/test_sourceTable.py +++ b/tests/test_sourceTable.py @@ -19,14 +19,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -""" -Tests for table.SourceTable - -Run with: - python test_sourceTable.py -or - pytest test_sourceTable.py -""" import os import unittest import tempfile