Skip to content

Commit bbd28e7

Browse files
committed
[delaunay-psm] Update to 1.6.3
1 parent 3a6da66 commit bbd28e7

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

delaunay-psm/Delaunay_psm.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ namespace GEO {
234234
#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 7
235235
#define geo_assume_aligned(var, alignment) \
236236
*(void**) (&var) = __builtin_assume_aligned(var, alignment)
237-
// the GCC way of specifiying that a pointer is aligned returns
237+
// the GCC way of specifying that a pointer is aligned returns
238238
// the aligned pointer (I can't figure out why). It needs to be
239239
// affected otherwise it is not taken into account (verified by
240240
// looking at the output of gcc -S)
@@ -915,7 +915,7 @@ namespace GEO {
915915
// TODO: try to better understand the formula and
916916
// determine why there are these sqrt's
917917
// (probably due to the relation between the
918-
// user-provided density and the one acheived
918+
// user-provided density and the one achieved
919919
// by CVT), but I'm pretty sure that the formula
920920
// is correct (at least, dimensions match).
921921
// Note: the ::fabs() are there to avoid numerical
@@ -3967,7 +3967,7 @@ namespace GEO {
39673967
Disables the warning caused by passing 'this' as an argument while
39683968
construction is not finished (in LoggerStream ctor).
39693969
As LoggerStreamBuf only stores the pointer for later use, so we can
3970-
ignore the fact that 'this' is not completly formed yet.
3970+
ignore the fact that 'this' is not completely formed yet.
39713971
*/
39723972
#ifdef GEO_OS_WINDOWS
39733973
#pragma warning(disable:4355)
@@ -6144,7 +6144,7 @@ namespace {
61446144
static void* run_thread(void* thread_in) {
61456145
Thread* thread = reinterpret_cast<Thread*>(thread_in);
61466146
// Sets the thread-local-storage instance pointer, so
6147-
// that Thread::current() can retreive it.
6147+
// that Thread::current() can retrieve it.
61486148
set_current_thread(thread);
61496149
thread->run();
61506150
return nil;
@@ -6556,7 +6556,7 @@ namespace {
65566556
static DWORD WINAPI run_thread(LPVOID p) {
65576557
Thread* thread = (*reinterpret_cast<Thread_var*>(p));
65586558
// Sets the thread-local-storage instance pointer, so
6559-
// that Thread::current() can retreive it.
6559+
// that Thread::current() can retrieve it.
65606560
set_current_thread(thread);
65616561
thread->run();
65626562
return 0;
@@ -6856,7 +6856,7 @@ namespace GEO {
68566856
// Get the pid of this process
68576857
DWORD processId = GetCurrentProcessId();
68586858

6859-
// then modify its privileges to allow full acces
6859+
// then modify its privileges to allow full access
68606860
HANDLE hHandle;
68616861

68626862
hHandle = ::OpenProcess(PROCESS_QUERY_INFORMATION, 0, processId);
@@ -19687,7 +19687,7 @@ namespace GEO {
1968719687
// generating branching instructions.
1968819688
// Thank to Laurent Alonso for this idea.
1968919689
index_t result = index_t( (T[1] == v) | ((T[2] == v) * 2) );
19690-
// Sanity check, important if it was T[0], not explicitely
19690+
// Sanity check, important if it was T[0], not explicitly
1969119691
// tested (detects input that does not meet the precondition).
1969219692
geo_debug_assert(T[result] == v);
1969319693
return result;
@@ -20212,7 +20212,7 @@ namespace GEO {
2021220212
index_t result = index_t(
2021320213
(T[1] == v) | ((T[2] == v) * 2) | ((T[3] == v) * 3)
2021420214
);
20215-
// Sanity check, important if it was T[0], not explicitely
20215+
// Sanity check, important if it was T[0], not explicitly
2021620216
// tested (detects input that does not meet the precondition).
2021720217
geo_debug_assert(T[result] == v);
2021820218
return result;
@@ -21459,7 +21459,7 @@ namespace GEO {
2145921459

2146021460
// A small optimization: if the point to be inserted
2146121461
// is on some faces of the located triangle, insert
21462-
// the neighbors accross those edges in the conflict list.
21462+
// the neighbors accros those edges in the conflict list.
2146321463
// It saves a couple of calls to the predicates in this
2146421464
// specific case (combinatorics are in general less
2146521465
// expensive than the predicates).
@@ -22568,7 +22568,7 @@ namespace GEO {
2256822568

2256922569
// A small optimization: if the point to be inserted
2257022570
// is on some faces of the located tetrahedron, insert
22571-
// the neighbors accross those faces in the conflict list.
22571+
// the neighbors accros those faces in the conflict list.
2257222572
// It saves a couple of calls to the predicates in this
2257322573
// specific case (combinatorics are in general less
2257422574
// expensive than the predicates).
@@ -22683,14 +22683,14 @@ namespace GEO {
2268322683
// Replace in new_t the vertex opposite to t1fbord with v
2268422684
set_tet_vertex(new_t, t1fbord, v);
2268522685

22686-
// Connect new_t with t1's neighbor accross t1fbord
22686+
// Connect new_t with t1's neighbor accros t1fbord
2268722687
{
2268822688
index_t tbord = index_t(tet_adjacent(t1,t1fbord));
2268922689
set_tet_adjacent(new_t, t1fbord, tbord);
2269022690
set_tet_adjacent(tbord, find_tet_adjacent(tbord,t1), new_t);
2269122691
}
2269222692

22693-
// Lookup new_t's neighbors accross its three other
22693+
// Lookup new_t's neighbors accros its three other
2269422694
// facets and connect them
2269522695
for(t1ft2=0; t1ft2<4; ++t1ft2) {
2269622696

@@ -23596,7 +23596,7 @@ namespace GEO {
2359623596
}
2359723597

2359823598
if(!ok) {
23599-
// At this point, this thread did not succesfully
23599+
// At this point, this thread did not successfully
2360023600
// acquire all the tets in the conflict zone, so
2360123601
// we need to rollback.
2360223602
release_tets();
@@ -24537,7 +24537,7 @@ namespace GEO {
2453724537
index_t result = index_t(
2453824538
(T[1] == v) | ((T[2] == v) * 2) | ((T[3] == v) * 3)
2453924539
);
24540-
// Sanity check, important if it was T[0], not explicitely
24540+
// Sanity check, important if it was T[0], not explicitly
2454124541
// tested (detects input that does not meet the precondition).
2454224542
geo_debug_assert(T[result] == v);
2454324543
return result;
@@ -24686,14 +24686,14 @@ namespace GEO {
2468624686
// Replace in new_t the vertex opposite to t1fbord with v
2468724687
set_tet_vertex(new_t, t1fbord, v);
2468824688

24689-
// Connect new_t with t1's neighbor accross t1fbord
24689+
// Connect new_t with t1's neighbor accros t1fbord
2469024690
{
2469124691
index_t tbord = index_t(tet_adjacent(t1,t1fbord));
2469224692
set_tet_adjacent(new_t, t1fbord, tbord);
2469324693
set_tet_adjacent(tbord, find_tet_adjacent(tbord,t1), new_t);
2469424694
}
2469524695

24696-
// Lookup new_t's neighbors accross its three other
24696+
// Lookup new_t's neighbors accros its three other
2469724697
// facets and connect them
2469824698
for(t1ft2=0; t1ft2<4; ++t1ft2) {
2469924699

@@ -25282,7 +25282,7 @@ namespace GEO {
2528225282

2528325283
if(benchmark_mode_) {
2528425284
if(nb_sequential_points != 0) {
25285-
Logger::out("PDEL") << "Local thread memory overflow occured:"
25285+
Logger::out("PDEL") << "Local thread memory overflow occurred:"
2528625286
<< std::endl;
2528725287
Logger::out("PDEL") << nb_sequential_points
2528825288
<< " points inserted in sequential mode"

delaunay-psm/Delaunay_psm.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ namespace GEO {
223223

224224
#if defined(__clang__)
225225
# define GEO_COMPILER_CLANG
226+
#elif defined(__GNUC__)
227+
# define GEO_COMPILER_GCC
226228
#else
227229
# error "Unsupported compiler"
228230
#endif
@@ -766,7 +768,7 @@ namespace GEO {
766768
#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 7
767769
#define geo_assume_aligned(var, alignment) \
768770
*(void**) (&var) = __builtin_assume_aligned(var, alignment)
769-
// the GCC way of specifiying that a pointer is aligned returns
771+
// the GCC way of specifying that a pointer is aligned returns
770772
// the aligned pointer (I can't figure out why). It needs to be
771773
// affected otherwise it is not taken into account (verified by
772774
// looking at the output of gcc -S)

0 commit comments

Comments
 (0)