Import Geant4 10.7.0 source tree
This commit is contained in:
@@ -20,21 +20,21 @@ public:
|
||||
:m_name(a_name)
|
||||
,m_cid(a_cid)
|
||||
,m_user_obj(a_user_obj) //WARNING : not owner.
|
||||
{}
|
||||
{}
|
||||
virtual ~column_booking() {}
|
||||
public:
|
||||
column_booking(const column_booking& a_from)
|
||||
:m_name(a_from.m_name)
|
||||
,m_cid(a_from.m_cid)
|
||||
,m_user_obj(a_from.m_user_obj)
|
||||
{}
|
||||
{}
|
||||
column_booking& operator=(const column_booking& a_from) {
|
||||
if(&a_from==this) return *this;
|
||||
m_name = a_from.m_name;
|
||||
m_cid = a_from.m_cid;
|
||||
m_user_obj = a_from.m_user_obj;
|
||||
return *this;
|
||||
}
|
||||
}
|
||||
public:
|
||||
const std::string& name() const {return m_name;}
|
||||
cid cls_id() const {return m_cid;}
|
||||
@@ -74,7 +74,7 @@ public:
|
||||
void add_column(const std::string& a_name,T& a_user) {
|
||||
m_columns.push_back(column_booking(a_name,_cid(T()),(void*)&a_user));
|
||||
}
|
||||
|
||||
|
||||
template <class T>
|
||||
void add_column_vec(const std::string& a_name) {
|
||||
m_columns.push_back(column_booking(a_name,_cid_std_vector<T>(),0));
|
||||
@@ -102,7 +102,7 @@ public:
|
||||
<< " bookings have not the same number of columns."
|
||||
<< " (" << m_columns.size() << " != " << a_nbk.m_columns.size() << ")."
|
||||
<< std::endl;
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
std::vector<column_booking>::const_iterator ait = a_nbk.m_columns.begin();
|
||||
tools_vforit(tools::column_booking,m_columns,it) {
|
||||
@@ -111,16 +111,16 @@ public:
|
||||
<< " columns don't have same name."
|
||||
<< " (" << (*it).name() << " != " << (*ait).name() << ")."
|
||||
<< std::endl;
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
if((*it).cls_id()!=(*ait).cls_id()) {
|
||||
a_out << "tools::ntuple_booking::has_similar_layout :"
|
||||
<< " columns don't have same class id."
|
||||
<< " (" << (*it).cls_id() << " != " << (*ait).cls_id() << ")."
|
||||
<< std::endl;
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
ait++;
|
||||
}
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user