Skip to content

Make the code build against libc++ on Linux #65

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

Open
per-gron wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make the code build against libc++ on Linux #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/gausspoint/gpline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define GPLINE_H

#include <iostream>
#include <math.h>
#include <cmath>
#include <vector>
#include "gausspoints.h"

Expand Down
8 changes: 4 additions & 4 deletions src/mesh/gentools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "lagrangeformfunction.h"
#include "slmpi.h"

#if defined(__linux__)
#if defined(__linux__) && !defined(_LIBCPP_VERSION)
#include <parallel/algorithm>
#endif

Expand All @@ -21,7 +21,7 @@ void gentools::stablecoordinatesort(std::vector<double> noisethreshold, std::vec
std::iota(reorderingvector.begin(), reorderingvector.end(), 0);
// Sort 'reorderingvector' according to 'coordinates' with x > y > z priority order:
// The < operator is overloaded by a lambda function.
#if defined(__linux__)
#if defined(__linux__) && !defined(_LIBCPP_VERSION)
__gnu_parallel::sort(reorderingvector.begin(), reorderingvector.end(), [&](int elem1, int elem2)
#else
std::sort(reorderingvector.begin(), reorderingvector.end(), [&](int elem1, int elem2)
Expand Down Expand Up @@ -276,7 +276,7 @@ void gentools::stablesort(std::vector<int>& tosort, std::vector<int>& reordering
std::iota(reorderingvector.begin(), reorderingvector.end(), 0);
// Sort 'reorderingvector' according to 'tosort':
// The < operator is overloaded by a lambda function.
#if defined(__linux__)
#if defined(__linux__) && !defined(_LIBCPP_VERSION)
__gnu_parallel::sort(reorderingvector.begin(), reorderingvector.end(), [&](int elem1, int elem2)
#else
std::sort(reorderingvector.begin(), reorderingvector.end(), [&](int elem1, int elem2)
Expand Down Expand Up @@ -352,7 +352,7 @@ bool sortfun(const std::tuple<int,int,double>& elem1, const std::tuple<int,int,d
void gentools::tuple3sort(std::vector<std::tuple<int,int,double>>& tosort)
{
// Parallel sort on Linux only for now:
#if defined(__linux__)
#if defined(__linux__) && !defined(_LIBCPP_VERSION)
__gnu_parallel::sort(tosort.begin(), tosort.end(), sortfun);
#else
std::sort(tosort.begin(), tosort.end(), sortfun);
Expand Down