Unverified Commit 6891c60c authored by Jason Wang's avatar Jason Wang Committed by GitHub
Browse files

Merge pull request #3153 from JasonRuonanWang/fix-type-enum 

fix type warning and enum conflict
parents 8121b202 d0a02411

source/adios2/engine/ssc/SscReader.cpp

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ StepStatus SscReader::BeginStep(const StepMode stepMode, 
                {

                    helper::Log("Engine", "SSCReader", "BeginStep",

                                "unknown data type", 0, m_Comm.Rank(), 0,

                                m_Verbosity, helper::LogMode::ERROR);

                                m_Verbosity, helper::FATALERROR);

                }

            }

        }
@@ -252,7 +252,7 @@ void SscReader::PerformGets() 
                        {

                            helper::Log("Engine", "SSCReader", "PerformGets",

                                        "unknown data type", 0, m_Comm.Rank(),

                                        0, m_Verbosity, helper::LogMode::ERROR);

                                        0, m_Verbosity, helper::FATALERROR);

                        }

                    }

                }

source/adios2/engine/ssc/SscReader.tcc

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ void SscReader::GetDeferredCommon(Variable<T> &variable, T *data) 
                    {

                        helper::Log("Engine", "SSCReader", "GetDeferredCommon",

                                    "unknown ShapeID", 0, m_Comm.Rank(), 0,

                                    m_Verbosity, helper::LogMode::ERROR);

                                    m_Verbosity, helper::FATALERROR);

                    }

                }

            }

source/adios2/helper/adiosCommDummy.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ void CommDummyError(const std::string &msg) 
    helper::Log("Helper", "adiosCommDummy", "CommDummyError",

                "CommDummy: a function returned error code '" + msg +

                    "'. Aborting!",

                helper::LogMode::ERROR);

                helper::FATALERROR);

    std::abort();

}

}

source/adios2/helper/adiosLog.cpp

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ std::string MakeMessage(const std::string &component, const std::string &source, 
    {

        m << warningColor << " [ADIOS2 WARNING]" << defaultColor;

    }

    else if (mode == ERROR)

    else if (mode == FATALERROR)

    {

        m << errorColor << " [ADIOS2 ERROR]" << defaultColor;

    }
@@ -102,7 +102,7 @@ void Log(const std::string &component, const std::string &source, 
    if ((logRank >= 0 && commRank >= 0 && logRank != commRank) ||

        priority > verbosity ||

        (messages.find(message) != messages.end() &&

         (mode == LogMode::ERROR || mode == LogMode::WARNING)))

         (mode == LogMode::FATALERROR || mode == LogMode::WARNING)))

    {

        return;

    }
@@ -115,7 +115,7 @@ void Log(const std::string &component, const std::string &source, 
    {

        std::cout << m;

    }

    else if (mode == ERROR)

    else if (mode == FATALERROR)

    {

        std::cerr << m;

    }

source/adios2/helper/adiosLog.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ namespace helper 
enum LogMode : char

{

    EXCEPTION = 'x',

    ERROR = 'e',

    FATALERROR = 'e',

    WARNING = 'w',

    INFO = 'i'

};