Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-419 #1

Merged
merged 9 commits into from
Sep 6, 2014
Merged

DM-419 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e1fc4de
Remove old slot definers from SourceTable
TallJimbo Aug 18, 2014
46f8852
Need to apply aliases in SubSchema implicit conversions
TallJimbo Aug 25, 2014
8718169
Clean up some tests and make sure they're executable
TallJimbo Aug 25, 2014
0c8edce
Switch to new slot definition classes, using aliases for version>0
TallJimbo Aug 25, 2014
241a107
Don't need to explicitly copy MatchVector slots; they're now in Schema
TallJimbo Aug 25, 2014
f05aa3e
Test, fix backwards compatibility for old slot persistence
TallJimbo Aug 25, 2014
64293af
Fix bug in AliasMap that caused replacement of non-aliases.
TallJimbo Aug 25, 2014
3375f4f
Improved documentation for slots
TallJimbo Sep 2, 2014
e5f4f91
Doc fixes from review of DM-419.
TallJimbo Sep 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/lsst/afw/table/Schema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ class SubSchema {
* wrappers provide an equivalent asKey() method.
*/
template <typename T>
operator Key<T>() const { return _impl->find<T>(_name).key; }
operator Key<T>() const { return _impl->find<T>(_aliases->apply(_name)).key; }

/**
* @brief Implicit conversion to the appropriate Key type.
Expand All @@ -390,7 +390,7 @@ class SubSchema {
* wrappers provide an equivalent asField() method.
*/
template <typename T>
operator Field<T>() const { return _impl->find<T>(_name).field; }
operator Field<T>() const { return _impl->find<T>(_aliases->apply(_name)).field; }

private:

Expand Down