File libghemical-3.0.0-no-return-in-nonvoid-function.patch of Package libghemical
Index: libghemical-3.0.0/src/eng1_qm.h
===================================================================
--- libghemical-3.0.0.orig/src/eng1_qm.h
+++ libghemical-3.0.0/src/eng1_qm.h
@@ -125,8 +125,8 @@ class eng1_qm : virtual public engine
eng1_qm(setup *, i32u);
virtual ~eng1_qm(void);
- virtual bool SetTorsionConstraint(atom *, atom *, atom *, atom *, f64, f64, bool) { assertion_failed(__FILE__, __LINE__, "not yet implemented!"); }
- virtual bool RemoveTorsionConstraint(atom *, atom *, atom *, atom *) { assertion_failed(__FILE__, __LINE__, "not yet implemented!"); }
+ virtual bool SetTorsionConstraint(atom *, atom *, atom *, atom *, f64, f64, bool) { assertion_failed(__FILE__, __LINE__, "not yet implemented!"); return false; }
+ virtual bool RemoveTorsionConstraint(atom *, atom *, atom *, atom *) { assertion_failed(__FILE__, __LINE__, "not yet implemented!"); return false; }
virtual fGL GetVDWSurf(fGL *, fGL *); // virtual
};
Index: libghemical-3.0.0/src/eng2_qm_mm.h
===================================================================
--- libghemical-3.0.0.orig/src/eng2_qm_mm.h
+++ libghemical-3.0.0/src/eng2_qm_mm.h
@@ -87,8 +87,8 @@ class eng2_qm_mm_mopac : public eng1_qm_
void Compute(i32u, bool = false); // virtual
- virtual bool SetTorsionConstraint(atom *, atom *, atom *, atom *, f64, f64, bool) { assertion_failed(__FILE__, __LINE__, "not yet implemented!"); }
- virtual bool RemoveTorsionConstraint(atom *, atom *, atom *, atom *) { assertion_failed(__FILE__, __LINE__, "not yet implemented!"); }
+ virtual bool SetTorsionConstraint(atom *, atom *, atom *, atom *, f64, f64, bool) { assertion_failed(__FILE__, __LINE__, "not yet implemented!"); return false; }
+ virtual bool RemoveTorsionConstraint(atom *, atom *, atom *, atom *) { assertion_failed(__FILE__, __LINE__, "not yet implemented!"); return false; }
void SetupPlotting(void); // virtual
Index: libghemical-3.0.0/src/model.cpp
===================================================================
--- libghemical-3.0.0.orig/src/model.cpp
+++ libghemical-3.0.0/src/model.cpp
@@ -316,7 +316,11 @@ bool model::GetCRDSetVisible(i32u index)
{
return cs_vector[index]->visible;
}
- else assertion_failed(__FILE__, __LINE__, "index overflow");
+ else
+ {
+ assertion_failed(__FILE__, __LINE__, "index overflow");
+ return false;
+ }
}
void model::SetCRDSetVisible(i32u index, bool visible)