- Fix compilation

git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@343 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
tchernobog 2006-02-17 23:33:35 +00:00
parent 759dfdad25
commit 07b0cd2687
4 changed files with 4 additions and 12 deletions

View File

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

View File

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

View File

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

View File

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