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

Migrate boost::array to std::array #16

Merged
merged 2 commits into from
May 4, 2016
Merged

Migrate boost::array to std::array #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8c6ef9
Migrate boost::array to std::array
May 4, 2016
1194bbd
Remove newline
May 4, 2016
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
10 changes: 6 additions & 4 deletions include/lsst/ip/diffim/DipoleAlgorithms.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#include <signal.h>
#include <stdlib.h>
#include <unistd.h>
#include <array>

#include "lsst/base.h"
#include "lsst/pex/config.h"
#include "ndarray/eigen.h"
Expand Down Expand Up @@ -153,7 +155,7 @@ inline DipoleCentroidAlgorithm::DipoleCentroidAlgorithm(
) :
_ctrl(ctrl)
{
static boost::array<meas::base::FlagDefinition,N_FLAGS> const flagDefs = {{
static std::array<meas::base::FlagDefinition,N_FLAGS> const flagDefs = {{
{"flag", "general failure flag, set if anything went wrong"},
{"pos_flag", "failure flag for positive, set if anything went wrong"},
{"neg_flag", "failure flag for negative, set if anything went wrong"}
Expand All @@ -176,7 +178,7 @@ inline DipoleCentroidAlgorithm::DipoleCentroidAlgorithm(
meas::base::CentroidResultKey::addFields(schema, name, doc+": overall centroid", meas::base::SIGMA_ONLY);
meas::base::CentroidResultKey::addFields(schema, name+"_pos", doc + ": positive lobe", meas::base::SIGMA_ONLY);
meas::base::CentroidResultKey::addFields(schema, name+"_neg", doc + ": negative lobe", meas::base::SIGMA_ONLY);
static boost::array<meas::base::FlagDefinition,N_FLAGS> const flagDefs = {{
static std::array<meas::base::FlagDefinition,N_FLAGS> const flagDefs = {{
{"flag", "general failure flag, set if anything went wrong"},
{"pos_flag", "failure flag for positive, set if anything went wrong"},
{"neg_flag", "failure flag for negative, set if anything went wrong"}
Expand All @@ -193,7 +195,7 @@ inline DipoleFluxAlgorithm::DipoleFluxAlgorithm(
) :
_ctrl(ctrl)
{
static boost::array<meas::base::FlagDefinition,N_FLAGS> const flagDefs = {{
static std::array<meas::base::FlagDefinition,N_FLAGS> const flagDefs = {{
{"flag", "general failure flag, set if anything went wrong"},
{"pos_flag", "failure flag for positive, set if anything went wrong"},
{"neg_flag", "failure flag for negative, set if anything went wrong"}
Expand All @@ -211,7 +213,7 @@ inline DipoleFluxAlgorithm::DipoleFluxAlgorithm(
) :
_ctrl(ctrl)
{
static boost::array<meas::base::FlagDefinition,N_FLAGS> const flagDefs = {{
static std::array<meas::base::FlagDefinition,N_FLAGS> const flagDefs = {{
{"flag", "general failure flag, set if anything went wrong"},
{"pos_flag", "failure flag for positive, set if anything went wrong"},
{"neg_flag", "failure flag for negative, set if anything went wrong"}
Expand Down