From: Paul Bédaride <paul.bedaride@gmail.com>
Date: Thu, 20 Mar 2014 10:54:37 +0000 (+0100)
Subject: Fix swig compile error
X-Git-Tag: v3_11~205^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f472faddf0540bcad1bf74a3a2ba5172b807d608

Fix swig compile error
---

diff --git a/buildtools/pipol/rc.debian b/buildtools/pipol/rc.debian
index 8a65effa15..67e8688e2a 100644
--- a/buildtools/pipol/rc.debian
+++ b/buildtools/pipol/rc.debian
@@ -4,6 +4,7 @@ sudo aptitude update
 
 sudo aptitude -y install cmake
 sudo aptitude -y install default-jdk
+sudo aptitude -y install swig
 sudo aptitude -y install f2c
 sudo aptitude -y install g++
 sudo aptitude -y install gcc
@@ -21,6 +22,7 @@ which_gcc=`which gcc`		#gcc gcc necessary
 which_gpp=`which g++`		#gcc g++ necessary
 which_make=`which make`		#make necessary
 which_java=`which java`		#java optional
+which_swig=`which swig`		#swig optional
 which_lua=`which lua`		#lua
 which_cmake=`which cmake`	#cmake necessary
 which_unzip=`which unzip`	#unzip for gtnets
@@ -35,6 +37,7 @@ echo $which_cmake
 echo $which_unzip
 echo $which_lua
 echo $which_java
+echo $which_swig
 echo $which_make
 echo $which_gcc
 echo $which_gpp
diff --git a/buildtools/pipol/rc.fedora b/buildtools/pipol/rc.fedora
index 6dcc08b535..9c0f818880 100644
--- a/buildtools/pipol/rc.fedora
+++ b/buildtools/pipol/rc.fedora
@@ -11,6 +11,7 @@ sudo yum -y -q install gcc
 sudo yum -y -q install git-core
 sudo yum -y -q install graphviz-dev graphviz
 sudo yum -y -q install java-1.6.0-openjdk
+sudo yum -y -q install swig
 sudo yum -y -q install libunwind libunwind-devel
 sudo yum -y -q install lua-devel lua
 sudo yum -y -q install make
@@ -24,6 +25,7 @@ which_gcc=`which gcc`		#gcc gcc necessary
 which_gpp=`which g++`		#gcc g++ necessary
 which_make=`which make`		#make necessary
 which_java=`which java`		#java optional
+which_swig=`which swig`		#swig optional
 which_lua=`which lua`		#lua
 which_cmake=`which cmake`	#cmake necessary
 which_unzip=`which unzip`	#unzip for gtnets
@@ -38,6 +40,7 @@ echo $which_cmake
 echo $which_unzip
 echo $which_lua
 echo $which_java
+echo $which_swig
 echo $which_make
 echo $which_gcc
 echo $which_gpp
@@ -48,4 +51,4 @@ echo $which_perl
 echo $which_f2c
 echo $which_gcov
 echo $which_git
-echo "FIN------------------------------------"
\ No newline at end of file
+echo "FIN------------------------------------"
diff --git a/buildtools/pipol/rc.mac b/buildtools/pipol/rc.mac
index 9fc740a2fa..7538a6cefa 100644
--- a/buildtools/pipol/rc.mac
+++ b/buildtools/pipol/rc.mac
@@ -4,6 +4,7 @@
 #sudo port install gcc46
 #sudo port install graphviz-devel
 #sudo port install lua
+#sudo port install swig
 #sudo port select bf2c
 
 sudo port install ruby19
@@ -16,6 +17,7 @@ which_gcc=`which gcc`		#gcc gcc necessary
 which_gpp=`which g++`		#gcc g++ necessary
 which_make=`which make`		#make necessary
 which_java=`which java`		#java optional
+which_java=`which swig`		#swig optional
 which_lua=`which lua`		#lua
 which_cmake=`which cmake`	#cmake necessary
 which_unzip=`which unzip`	#unzip for gtnets
@@ -30,6 +32,7 @@ echo $which_cmake
 echo $which_unzip
 echo $which_lua
 echo $which_java
+echo $which_swig
 echo $which_make
 echo $which_gcc
 echo $which_gpp
@@ -39,4 +42,4 @@ echo $which_perl
 echo $which_f2c
 echo $which_gcov
 echo $which_git
-echo "FIN------------------------------------"
\ No newline at end of file
+echo "FIN------------------------------------"
diff --git a/buildtools/pipol/rc.ubuntu b/buildtools/pipol/rc.ubuntu
index b2b9d25a32..19658e8b71 100644
--- a/buildtools/pipol/rc.ubuntu
+++ b/buildtools/pipol/rc.ubuntu
@@ -4,6 +4,7 @@ sudo apt-get update
 
 sudo apt-get -y -qq install cmake
 sudo apt-get -y -qq install default-jdk
+sudo apt-get -y -qq install swig
 sudo apt-get -y -qq install f2c
 sudo apt-get -y -qq install g++
 sudo apt-get -y -qq install gcc
@@ -33,6 +34,7 @@ which_gcc=`which gcc`		#gcc gcc necessary
 which_gpp=`which g++`		#gcc g++ necessary
 which_make=`which make`		#make necessary
 which_java=`which java`		#java optional
+which_swig=`which swig`		#swig optional
 which_lua=`which lua`		#lua
 which_cmake=`which cmake`	#cmake necessary
 which_unzip=`which unzip`	#unzip for gtnets
@@ -47,6 +49,7 @@ echo $which_cmake
 echo $which_unzip
 echo $which_lua
 echo $which_java
+echo $which_swig
 echo $which_make
 echo $which_gcc
 echo $which_gpp
@@ -57,4 +60,4 @@ echo $which_perl
 echo $which_f2c
 echo $which_gcov
 echo $which_git
-echo "FIN------------------------------------"
\ No newline at end of file
+echo "FIN------------------------------------"
diff --git a/src/bindings/java/surf_swig.cpp b/src/bindings/java/surf_swig.cpp
index 6da728c427..b0378b7253 100644
--- a/src/bindings/java/surf_swig.cpp
+++ b/src/bindings/java/surf_swig.cpp
@@ -3,7 +3,7 @@
 #include "surf_swig.hpp"
 
 double getClock() {
-  surf_get_clock();
+  return surf_get_clock();
 }
 
 void Plugin::activateCpuCreatedCallback(){