core system
force strict ISO C++ (-Wpedantic) TODO: still a lot of variadic macros are not valid ISO C++
This commit is contained in:
@@ -80,7 +80,7 @@ void * _class_::create(void){return 0;}
|
||||
|
||||
/// define to implement a subclass of Base::BaseClass
|
||||
#define TYPESYSTEM_SOURCE(_class_, _parentclass_) \
|
||||
TYPESYSTEM_SOURCE_P(_class_);\
|
||||
TYPESYSTEM_SOURCE_P(_class_)\
|
||||
void _class_::init(void){\
|
||||
initSubclass(_class_::classTypeId, #_class_ , #_parentclass_, &(_class_::create) ); \
|
||||
}
|
||||
@@ -94,7 +94,7 @@ template<> void _class_::init(void){\
|
||||
|
||||
/// define to implement a subclass of Base::BaseClass
|
||||
#define TYPESYSTEM_SOURCE_ABSTRACT(_class_, _parentclass_) \
|
||||
TYPESYSTEM_SOURCE_ABSTRACT_P(_class_);\
|
||||
TYPESYSTEM_SOURCE_ABSTRACT_P(_class_)\
|
||||
void _class_::init(void){\
|
||||
initSubclass(_class_::classTypeId, #_class_ , #_parentclass_, &(_class_::create) ); \
|
||||
}
|
||||
@@ -114,11 +114,11 @@ public:
|
||||
virtual PyObject *getPyObject(void);
|
||||
virtual void setPyObject(PyObject *);
|
||||
|
||||
static void *create(void){return 0;}
|
||||
static void *create(void){return nullptr;}
|
||||
private:
|
||||
static Type classTypeId;
|
||||
protected:
|
||||
static void initSubclass(Base::Type &toInit,const char* ClassName, const char *ParentName, Type::instantiationMethod method=0);
|
||||
static void initSubclass(Base::Type &toInit,const char* ClassName, const char *ParentName, Type::instantiationMethod method=nullptr);
|
||||
|
||||
public:
|
||||
/// Construction
|
||||
|
||||
@@ -31,12 +31,12 @@
|
||||
#include "Console.h"
|
||||
#include <CXX/Objects.hxx>
|
||||
|
||||
FC_LOG_LEVEL_INIT("Exception", true, true);
|
||||
FC_LOG_LEVEL_INIT("Exception", true, true)
|
||||
|
||||
using namespace Base;
|
||||
|
||||
|
||||
TYPESYSTEM_SOURCE(Base::Exception,Base::BaseClass);
|
||||
TYPESYSTEM_SOURCE(Base::Exception,Base::BaseClass)
|
||||
|
||||
|
||||
Exception::Exception(void)
|
||||
@@ -151,7 +151,7 @@ void Exception::setPyObject( PyObject * pydict)
|
||||
|
||||
// ---------------------------------------------------------
|
||||
|
||||
TYPESYSTEM_SOURCE(Base::AbortException,Base::Exception);
|
||||
TYPESYSTEM_SOURCE(Base::AbortException,Base::Exception)
|
||||
|
||||
AbortException::AbortException(const char * sMessage)
|
||||
: Exception( sMessage )
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
using namespace Base;
|
||||
|
||||
TYPESYSTEM_SOURCE_ABSTRACT(Base::Persistence,Base::BaseClass);
|
||||
TYPESYSTEM_SOURCE_ABSTRACT(Base::Persistence,Base::BaseClass)
|
||||
|
||||
|
||||
//**************************************************************************
|
||||
|
||||
@@ -349,7 +349,7 @@ double num_change(char* yytext,char dez_delim,char grp_delim)
|
||||
|
||||
ret_val = atof( temp );
|
||||
return ret_val;
|
||||
};
|
||||
}
|
||||
|
||||
// error func
|
||||
void Quantity_yyerror(char *errorinfo)
|
||||
|
||||
@@ -68,7 +68,7 @@ namespace Base {
|
||||
std::vector<SequencerBase*> SequencerP::_instances;
|
||||
SequencerLauncher* SequencerP::_topLauncher = 0;
|
||||
QMutex SequencerP::mutex(QMutex::Recursive);
|
||||
};
|
||||
}
|
||||
|
||||
SequencerBase& SequencerBase::Instance ()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user