Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Rename one of two eServer classes into eIpcServer to avoid conflict
Which resulted in "successful" compilation and linking but bugged executable
  • Loading branch information
tea committed Oct 29, 2010
1 parent 585646c commit e43ba0b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/eApp.cpp
Expand Up @@ -261,7 +261,7 @@ bool eApp::OnInit() {
#ifdef __WXMSW__
new eIpcWin(*this); // hidden win to receive ipc messages
#else
m_server = new eServer(*this);
m_server = new eIpcServer(*this);
m_server->Create(wxT("eServer"));
#endif

Expand Down Expand Up @@ -845,4 +845,4 @@ void eApp::OnInputLineChanged(unsigned int nid, const wxString& text) {

void eApp::OnInputLineClosed(unsigned int nid) {
m_apiHandler->OnInputLineClosed(nid);
}
}
2 changes: 1 addition & 1 deletion src/eApp.h
Expand Up @@ -141,7 +141,7 @@ class eApp : public wxApp,
ApiHandler* m_apiHandler;

#ifndef __WXMSW__
eServer* m_server;
eIpcServer* m_server;
#endif

// Option vars
Expand Down
6 changes: 3 additions & 3 deletions src/eIpcServer.cpp
Expand Up @@ -65,12 +65,12 @@ WXLRESULT eIpcWin::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

#else

// ---- eServer -----------------------------------
// ---- eIpcServer -----------------------------------

eServer::eServer(IExecuteAppCommand& app) : app(app) {
eIpcServer::eIpcServer(IExecuteAppCommand& app) : app(app) {
}

wxConnectionBase* eServer::OnAcceptConnection(const wxString& topic)
wxConnectionBase* eIpcServer::OnAcceptConnection(const wxString& topic)
{
if ( topic == _T("e") )
return new eConnection(app);
Expand Down
6 changes: 3 additions & 3 deletions src/eIpcServer.h
Expand Up @@ -38,10 +38,10 @@ class eIpcWin : public wxFrame {

#else

class eServer : public wxServer {
class eIpcServer : public wxServer {
public:
eServer(IExecuteAppCommand& app);
wxConnectionBase *OnAcceptConnection(const wxString& topic);
eIpcServer(IExecuteAppCommand& app);
wxConnectionBase *OnAcceptConnection(const wxString& topic);

private:
IExecuteAppCommand& app;
Expand Down

0 comments on commit e43ba0b

Please sign in to comment.