Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Rename one of two eServer classes into eIpcServer to avoid conflict

Which resulted in "successful" compilation and linking but bugged executable
  • Loading branch information...
commit e43ba0bf88aaa503b341858ccee54f774d4083a2 1 parent 585646c
Andrey Turkin tea authored
4 src/eApp.cpp
View
@@ -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
@@ -845,4 +845,4 @@ void eApp::OnInputLineChanged(unsigned int nid, const wxString& text) {
void eApp::OnInputLineClosed(unsigned int nid) {
m_apiHandler->OnInputLineClosed(nid);
-}
+}
2  src/eApp.h
View
@@ -141,7 +141,7 @@ class eApp : public wxApp,
ApiHandler* m_apiHandler;
#ifndef __WXMSW__
- eServer* m_server;
+ eIpcServer* m_server;
#endif
// Option vars
6 src/eIpcServer.cpp
View
@@ -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);
6 src/eIpcServer.h
View
@@ -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;
Please sign in to comment.
Something went wrong with that request. Please try again.