static member variables must be initialized
This commit is contained in:
@@ -271,7 +271,7 @@
|
||||
|
||||
apps.${system}.default = {
|
||||
type = "app";
|
||||
program = "${self.Archimedes}/bin/Archimedes";
|
||||
program = "${self.Archimedes.examples.minimal}/bin/Archimedes";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
@@ -11,10 +11,11 @@ namespace Archimedes {
|
||||
|
||||
friend class App;
|
||||
|
||||
static std::list<std::string*> modules;
|
||||
|
||||
public:
|
||||
typedef Module* create_t(void*, App*);
|
||||
|
||||
static std::list<std::string*> modules;
|
||||
|
||||
static std::list<std::string*>& GetModules() { return modules; }
|
||||
|
||||
@@ -41,4 +42,6 @@ namespace Archimedes {
|
||||
};
|
||||
}
|
||||
|
||||
auto Archimedes::Module::modules = std::list<std::string*>();
|
||||
|
||||
#endif
|
||||
|
||||
@@ -6,7 +6,7 @@ void MinimalApp::run() {
|
||||
for(auto* m : modules)
|
||||
m->onLoad();
|
||||
|
||||
for(auto* s : Archimedes::Module::GetModules())
|
||||
for(auto* s : Archimedes::Module::modules)
|
||||
std::cout << "Module: " << (s ? *s : "nullptr") << std::endl;
|
||||
// Main loop
|
||||
while (!done && !modules.empty()) {
|
||||
|
||||
@@ -23,9 +23,9 @@ class MinimalApp : public Archimedes::App {
|
||||
|
||||
void run();
|
||||
|
||||
void stopModule(std::list<Archimedes::Module*>::iterator);
|
||||
//void stopModule(std::list<Archimedes::Module*>::iterator);
|
||||
|
||||
void startModule(std::string);
|
||||
//void startModule(std::string);
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user