Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge to development #156

Merged
merged 15 commits into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OdbDesignLib/App/IOdbServerApp.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Odb::Lib::App
public:
virtual ~IOdbServerApp() {}

virtual crow::SimpleApp& crow_app() = 0;
virtual CrowApp& crow_app() = 0;

protected:
IOdbServerApp() = default;
Expand Down
2 changes: 1 addition & 1 deletion OdbDesignLib/App/OdbServerAppBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ namespace Odb::Lib::App
return ExitCode::Success;
}

crow::SimpleApp& OdbServerAppBase::crow_app()
CrowApp& OdbServerAppBase::crow_app()
{
return m_crowApp;
}
Expand Down
5 changes: 3 additions & 2 deletions OdbDesignLib/App/OdbServerAppBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Odb::Lib::App
OdbServerAppBase(int argc, char* argv[]);
virtual ~OdbServerAppBase();

crow::SimpleApp& crow_app() override;
CrowApp& crow_app() override;

Utils::ExitCode Run() override;

Expand All @@ -24,7 +24,8 @@ namespace Odb::Lib::App
virtual void add_controllers() = 0;

private:
crow::SimpleApp m_crowApp;
CrowApp m_crowApp;
//crow::SimpleApp m_crowApp;

void register_routes();

Expand Down
Loading
Loading