Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tiago Peixoto
graph-tool
Commits
cfb62351
Commit
cfb62351
authored
Apr 15, 2008
by
Tiago Peixoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix boost and boost::python ambiguity and numpy problems in run_action
parent
780a8055
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
configure.ac
configure.ac
+1
-0
src/graph/graph_bind.cc
src/graph/graph_bind.cc
+1
-1
src/graph_tool/run_action/inline.py
src/graph_tool/run_action/inline.py
+1
-1
No files found.
configure.ac
View file @
cfb62351
...
...
@@ -218,6 +218,7 @@ AC_DEFINE_UNQUOTED([INSTALL_PREFIX],"${prefix}", [python prefix])
AC_DEFINE_UNQUOTED([PYTHON_DIR], "${PYLIBDIR}", [The directory name for the site-packages subdirectory of the standard Python install tree.])
AC_DEFINE_UNQUOTED([CXXFLAGS],"${CXXFLAGS}", [c++ compilation options])
AC_DEFINE_UNQUOTED([CPPFLAGS],"${CPPFLAGS}", [c++ preprocessor compilation options])
AC_DEFINE_UNQUOTED([PACKAGE_DATA_DIR], "${packageprefix}/${packagedatadir}", [package data dir])
AC_DEFINE_UNQUOTED([PACKAGE_DOC_DIR], "${packageprefix}/${packagedocdir}", [package doc dir])
...
...
src/graph/graph_bind.cc
View file @
cfb62351
...
...
@@ -41,7 +41,7 @@ struct LibInfo
string
GetVersion
()
const
{
return
VERSION
" (commit "
GIT_COMMIT
", "
GIT_COMMIT_DATE
")"
;}
string
GetLicense
()
const
{
return
"GPL version 3 or above"
;}
string
GetCXXFLAGS
()
const
{
return
CXXFLAGS
;}
string
GetCXXFLAGS
()
const
{
return
CXXFLAGS
" "
CPPFLAGS
;}
string
GetInstallPrefix
()
const
{
return
INSTALL_PREFIX
;}
string
GetPythonDir
()
const
{
return
PYTHON_DIR
;}
};
...
...
src/graph_tool/run_action/inline.py
View file @
cfb62351
...
...
@@ -92,7 +92,7 @@ def inline(g, code, arg_names=[], local_dict=None,
python::object pg(python::handle<>
(python::borrowed((PyObject*)(self___graph))));
GraphInterface& g = python::extract<GraphInterface&>(pg);
RunAction(g, make_action(make_tuple(${args}), return_val));
RunAction(g, make_action(
boost::
make_tuple(${args}), return_val));
// support code hash: ${support_hash}
"""
).
substitute
(
args
=
", "
.
join
([
"&%s"
%
a
for
a
in
arg_names
]),
code_hash
=
code_hash
,
support_hash
=
support_hash
)
...
...
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