Commit fb6f6857 authored by ext-calvo_p's avatar ext-calvo_p
Browse files

Merge branch '700-compiler-error-boost-bimap-assignation-fails' into 'master'

Resolve "Compiler error: boost::bimap assignation fails"

Closes #700

See merge request OPAL/src!559
parents c673125d 48997dcc
......@@ -41,12 +41,11 @@ extern Inform* gmsg;
using namespace Options;
const boost::bimap<DumpFrame, std::string> Option::bmDumpFrameString_s = {
const boost::bimap<DumpFrame, std::string> Option::bmDumpFrameString_s =
boost::assign::list_of<const boost::bimap<DumpFrame, std::string>::relation>
(DumpFrame::GLOBAL, "GLOBAL")
(DumpFrame::BUNCH_MEAN, "BUNCH_MEAN")
(DumpFrame::REFERENCE, "REFERENCE")
};
(DumpFrame::REFERENCE, "REFERENCE");
namespace {
// The attributes of class Option.
......
......@@ -36,11 +36,10 @@
extern Inform *gmsg;
const boost::bimap<CavityType, std::string> RFCavity::bmCavityTypeString_s = {
const boost::bimap<CavityType, std::string> RFCavity::bmCavityTypeString_s =
boost::assign::list_of<const boost::bimap<CavityType, std::string>::relation>
(CavityType::SW, "STANDING")
(CavityType::SGSW, "SINGLEGAP")
};
(CavityType::SGSW, "SINGLEGAP");
RFCavity::RFCavity():
......
......@@ -46,7 +46,7 @@ double ParticleProperties::getParticleChargeInCoulomb(const ParticleType& type)
return getParticleCharge(type) * Physics::q_e;
}
const boost::bimap<ParticleType, std::string> ParticleProperties::bmParticleType_s = {
const boost::bimap<ParticleType, std::string> ParticleProperties::bmParticleType_s =
boost::assign::list_of<const boost::bimap<ParticleType, std::string>::relation>
(ParticleType::UNNAMED, "UNNAMED")
(ParticleType::ELECTRON, "ELECTRON")
......@@ -62,8 +62,7 @@ const boost::bimap<ParticleType, std::string> ParticleProperties::bmParticleType
(ParticleType::ALPHA, "ALPHA")
(ParticleType::CARBON, "CARBON")
(ParticleType::XENON, "XENON")
(ParticleType::URANIUM, "URANIUM")
};
(ParticleType::URANIUM, "URANIUM");
const std::map<ParticleType, double> ParticleProperties::particleMass_m = {
{ParticleType::ELECTRON, Physics::m_e},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment