- Fix compilation

git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@343 3ecf2c5c-341e-0410-92b4-d18e462d057c

doc/Makefile.am

@@ -42,3 +42,4 @@ distclean-local :
 	if test -d './API'; then rm -rf './API'; fi
 
 MAINTAINERCLEANFILES = API
+

src/Makefile.am

@@ -18,7 +18,7 @@
 # along with SGPEMv2; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-SUBDIRS = backend builtin-policies pyloader testsuite
+SUBDIRS = backend builtin-policies testsuite
 
 #additional rules:
 %_wrap.cc : %.i
@@ -42,9 +42,8 @@ sgpemv2_CPPFLAGS = -I@top_srcdir@ \
 		$(PYTHON_CPPFLAGS) \
 		$(GTHREAD_CFLAGS)
 sgpemv2_LDFLAGS = -L@builddir@/backend \
-		  -L@builddir@/pyloader \
 		  $(LT_LDFLAGS)
-sgpemv2_LDADD = -lbackend -lpyloader \
+sgpemv2_LDADD = -lbackend \
 		$(CAIRO_LIBS) \
 		$(GTKMM_LIBS) \
 		$(GTHREAD_LIBS)

src/io_manager.hh

@@ -38,12 +38,11 @@ namespace sgpem {
   {    
   public:
     virtual ~IOManager() {}
-<<<<<<< .mine
    	
 	/**Writes a string into an output (the console, a text widget, ...)
 	\returns the number of charaters written
 	*/
-    virtual uint			write_buffer(const Glib::ustring& buffer) = 0;
+    virtual unsigned int write_buffer(const Glib::ustring& buffer) = 0;
 	
 	/**Reads a command from an interactive input (the console, a text widget, ...)
 	\returns a trimmed string (without blank spaces, tabs... at the extremities)	
@@ -53,11 +52,6 @@ namespace sgpem {
 	/**Specify whether this IOManger permits to write and read at the same time	
 	*/
 	virtual bool			is_full_duplex() = 0;
-=======
-    
-    virtual uint			write_buffer(const Glib::ustring& buffer) = 0;
-    virtual Glib::ustring	read_command() = 0;
->>>>>>> .r341
   };
 
 }

src/main.cc

@@ -34,8 +34,6 @@
 #include "backend/process.hh"
 #include "backend/policy.hh"
 #include "backend/policy_parameters.hh"
-#include "backend/python_policy.hh"
-#include "backend/python_policy_manager.hh"
 #include "standard_io.hh"
 #include "text_simulation.hh"