Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
graph-tool
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
40
Issues
40
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tiago Peixoto
graph-tool
Commits
86ed2c2b
Commit
86ed2c2b
authored
Nov 18, 2010
by
Tiago Peixoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small fixes to allow compilation in MacOS X
parent
cee78307
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
8 deletions
+18
-8
autogen.sh
autogen.sh
+5
-1
configure.ac
configure.ac
+6
-3
src/graph/generation/graph_geometric.hh
src/graph/generation/graph_geometric.hh
+6
-3
src/graph/generation/graph_price.hh
src/graph/generation/graph_price.hh
+1
-1
No files found.
autogen.sh
View file @
86ed2c2b
...
...
@@ -21,7 +21,11 @@ fi
aclocal
-I
m4
||
exit
$?
autoheader
||
exit
$?
libtoolize
-f
||
exit
$?
if
[
`
type
-P
libtoolize
`
]
;
then
libtoolize
-f
||
exit
$?
else
glibtoolize
-f
||
exit
$?
fi
automake
--add-missing
--copy
||
exit
$?
autoconf
||
exit
$?
...
...
configure.ac
View file @
86ed2c2b
...
...
@@ -33,6 +33,7 @@ AC_HEADER_STDC
AC_DISABLE_STATIC
LT_INIT
AC_PROG_INSTALL
AC_CANONICAL_TARGET
dnl turn on warnings
[CXXFLAGS="${CXXFLAGS} -Wall"]
...
...
@@ -294,10 +295,12 @@ AC_SUBST(MOD_LIBADD)
# needed for typeinfo objects to work across DSO boundaries.
# see http://gcc.gnu.org/faq.html#dso
[MOD_LDFLAGS="-module
-avoid-version -export-dynamic -no-undefined -Wl,-E
"]
[MOD_LDFLAGS="-module
-avoid-version -export-dynamic -no-undefined -Wl,-E -Wl,--as-needed
"]
# link libraries as needed
[MOD_LDFLAGS="${MOD_LDFLAGS} -Wl,--as-needed"]
# MacOS needs different options
if test "x${target_os}" = "xdarwin"; then
[MOD_LDFLAGS="-module -dynamiclib"]
fi
AC_SUBST(MOD_LDFLAGS)
...
...
src/graph/generation/graph_geometric.hh
View file @
86ed2c2b
...
...
@@ -28,6 +28,9 @@
#include <boost/functional/hash.hpp>
#include "graph_util.hh"
#include <ext/numeric>
using
__gnu_cxx
::
power
;
namespace
graph_tool
{
using
namespace
std
;
...
...
@@ -133,10 +136,10 @@ struct get_geometric
typename
graph_traits
<
Graph
>::
vertex_descriptor
v
=
vertex
(
i
,
g
);
get_box
(
points
[
i
],
w
,
box
,
ranges
,
periodic_boundary
);
for
(
size_t
k
=
0
;
k
<
pow
(
3
,
box
.
size
(
));
++
k
)
for
(
int
k
=
0
;
k
<
power
(
3
,
int
(
box
.
size
()
));
++
k
)
{
for
(
size_
t
j
=
0
;
j
<
box
.
size
();
++
j
)
box
[
j
]
+=
(
int
(
k
/
pow
(
3
,
j
))
%
3
)
-
1
;
for
(
in
t
j
=
0
;
j
<
box
.
size
();
++
j
)
box
[
j
]
+=
((
k
/
power
(
3
,
j
))
%
3
)
-
1
;
if
(
periodic_boundary
)
periodic
(
box
,
box_ranges
);
...
...
src/graph/generation/graph_price.hh
View file @
86ed2c2b
...
...
@@ -27,7 +27,7 @@
# include <tr1/unordered_set>
#else
# include <boost/tr1/random.hpp>
# include <boost/tr1/unordered_set>
# include <boost/tr1/unordered_set
.hpp
>
#endif
#include <map>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment