From 4cae8ac9fc4d6b81a012ceedb24456c1742b120b Mon Sep 17 00:00:00 2001 From: Jens Thiele Date: Mon, 20 Nov 2006 16:43:18 +0000 Subject: [PATCH 1/1] include common cpp from server cpp --- examples/Makefile.am | 2 +- examples/minimalistic-server-stub.cpp | 2 ++ examples/minimalistic-server.cpp | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index 15097fb..0b24d4b 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libminimalistic-client.la minimalistic_client_SOURCES = minimalistic-client.cpp minimalistic_client_LDADD = $(LDADD) libminimalistic-client.la -minimalistic_server_SOURCES = minimalistic-server.cpp minimalistic-server-stub.cpp minimalistic-stub.cpp +minimalistic_server_SOURCES = minimalistic-server.cpp minimalistic-server-stub.cpp noinst_PROGRAMS = minimalistic_client minimalistic_server diff --git a/examples/minimalistic-server-stub.cpp b/examples/minimalistic-server-stub.cpp index cb30607..996fe40 100644 --- a/examples/minimalistic-server-stub.cpp +++ b/examples/minimalistic-server-stub.cpp @@ -6,3 +6,5 @@ libt2n::result* testfunc_cmd::operator()() { return new testfunc_res(testfunc(param)); } + +#include "minimalistic-stub.cpp" diff --git a/examples/minimalistic-server.cpp b/examples/minimalistic-server.cpp index 90dbc22..dde3843 100644 --- a/examples/minimalistic-server.cpp +++ b/examples/minimalistic-server.cpp @@ -12,9 +12,9 @@ using namespace std; -LIBT2N_SET_DEFAULTGROUP(example) +LIBT2N_SET_DEFAULTGROUP(example); -LIBT2N_EXPORT string testfunc(const string& str) +LIBT2N_EXPORT std::string testfunc(const string& str) { string ret; if (str=="throw") -- 1.7.1