LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Merged muonspin/musrfit:root6 into master

Browse Source
This commit is contained in:
Zaher Salman 2022-11-07 15:44:01 +01:00
commit b8622fefa8
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/musredit_qt5/mupp/var/include/PExpressionDef.hpp
View File

@ -33,7 +33,7 @@
#include "PExpression.hpp" #include "PExpression.hpp"
#include "PErrorHandler.hpp" #include "PErrorHandler.hpp"
#include "PAnnotation.hpp" #include "PAnnotation.hpp"
#include <boost/spirit/include/phoenix_function.hpp> #include <boost/phoenix/function.hpp>
namespace mupp { namespace parser namespace mupp { namespace parser
{ {

6
src/musredit_qt5/mupp/var/include/PProgram.hpp
View File

@ -42,9 +42,9 @@
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/spirit/include/phoenix_core.hpp> #include <boost/phoenix/core.hpp>
#include <boost/spirit/include/phoenix_function.hpp> #include <boost/phoenix/function.hpp>
#include <boost/spirit/include/phoenix_operator.hpp> #include <boost/phoenix/operator.hpp>
namespace mupp { namespace prog { namespace mupp { namespace prog {
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////

2
src/musredit_qt5/musrStep/PMusrStep.cpp
View File

@ -544,7 +544,7 @@ int PMusrStep::writeMsrFile()
bool paramBlock = false; bool paramBlock = false;
do { do {
line = getLine(data, idx); line = getLine(data, idx);
if ((idx == -1) || (idx == data.count())) { if ((idx == -1) || (idx == data.size())) {
done = true; done = true;
} else { } else {
if (line.startsWith("FITPARAMETER")) { if (line.startsWith("FITPARAMETER")) {

2
src/musredit_qt6/mupp/var/include/PExpressionDef.hpp
View File

@ -33,7 +33,7 @@
#include "PExpression.hpp" #include "PExpression.hpp"
#include "PErrorHandler.hpp" #include "PErrorHandler.hpp"
#include "PAnnotation.hpp" #include "PAnnotation.hpp"
#include <boost/spirit/include/phoenix_function.hpp> #include <boost/phoenix/function.hpp>
namespace mupp { namespace parser namespace mupp { namespace parser
{ {

6
src/musredit_qt6/mupp/var/include/PProgram.hpp
View File

@ -42,9 +42,9 @@
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/spirit/include/phoenix_core.hpp> #include <boost/phoenix/core.hpp>
#include <boost/spirit/include/phoenix_function.hpp> #include <boost/phoenix/function.hpp>
#include <boost/spirit/include/phoenix_operator.hpp> #include <boost/phoenix/operator.hpp>
namespace mupp { namespace prog { namespace mupp { namespace prog {
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////

2
src/musredit_qt6/musrStep/PMusrStep.cpp
View File

@ -539,7 +539,7 @@ int PMusrStep::writeMsrFile()
bool paramBlock = false; bool paramBlock = false;
do { do {
line = getLine(data, idx); line = getLine(data, idx);
if ((idx == -1) || (idx == data.count())) { if ((idx == -1) || (idx == data.size())) {
done = true; done = true;
} else { } else {
if (line.startsWith("FITPARAMETER")) { if (line.startsWith("FITPARAMETER")) {