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.

Sign up for GitHub

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

Fix compilation under gcc7.5 #81

Merged
merged 5 commits into from
Nov 4, 2024
+5 −1
Merged

Fix compilation under gcc7.5 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
189e01d
Correct typo in individual license file name
huguesdpdn-aerospace Aug 14, 2024
401bbd7
Merge branch 'Ondsel-Development:main' into main
huguesdpdn-aerospace Aug 15, 2024
a91f170
Merge branch 'Ondsel-Development:main' into main
huguesdpdn-aerospace Sep 3, 2024
5540929
Merge branch 'Ondsel-Development:main' into main
huguesdpdn-aerospace Sep 20, 2024
444c219
Fix compilation under GCC 7.5 for Ubuntu
huguesdpdn-aerospace Sep 20, 2024
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
5 changes: 5 additions & 0 deletions OndselSolver/ASMTAssembly.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@
#include "ASMTRotationLimit.h"
#include "ASMTTranslationLimit.h"
#include "ExternalSystem.h"
#if __GNUC__ >= 8
#include <filesystem>
#endif

using namespace MbD;

Expand Down Expand Up @@ -359,8 +361,11 @@ void MbD::ASMTAssembly::runSinglePendulum()

std::shared_ptr<ASMTAssembly> MbD::ASMTAssembly::assemblyFromFile(const std::string& fileName)
{
// https://stackoverflow.com/a/45867491
#if __GNUC__ >= 8
Comment on lines +364 to +365
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still won't compile due to #include <filesystem> on line 65.

std::filesystem::path currentPath = std::filesystem::current_path();
std::cout << "Current directory: " << currentPath << std::endl;
#endif

std::ifstream stream(fileName);
if (stream.fail()) {
Expand Down
1 change: 0 additions & 1 deletion OndselSolverMain/OndselSolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* @brief Program to assemble a piston crank system.
*********************************************************************/

#include <filesystem>
#include "../OndselSolver/CADSystem.h"
#include "../OndselSolver/CREATE.h"
#include "../OndselSolver/GESpMatParPvPrecise.h"
Expand Down