diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-09-23 18:05:15 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-09-23 18:05:15 +0000 |
| commit | 5a3a7c969cf6253eb1dcc82e95ad8516cc6acff8 (patch) | |
| tree | 5383e51e77f538544ee6ba0d766134ae1ed1a34c | |
| parent | e6f2ead8626f969a729f563e380a070e8356ff02 (diff) | |
More compile fixes
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8057 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | src/modules/m_spanningtree/treesocket1.cpp | 2 | ||||
| -rw-r--r-- | src/modules/rpc.h | 2 | ||||
| -rw-r--r-- | src/users.cpp | 2 | ||||
| -rw-r--r-- | win/m_spanningtreeVC80.vcproj | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index 6790fda83..2c8fc34a9 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -1071,7 +1071,7 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa { _new = new userrec(this->Instance, params[0]); } - catch (CoreException &e) + catch (...) { SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user"); return false; diff --git a/src/modules/rpc.h b/src/modules/rpc.h index cdaec4082..c9acc3b7d 100644 --- a/src/modules/rpc.h +++ b/src/modules/rpc.h @@ -238,7 +238,7 @@ class RPCValue : public classbase return it->second; } - std::pair<RPCObjectContainer::iterator,RPCObjectContainer::iterator> GetObjectIterator() throw() + std::pair<RPCObjectContainer::iterator,RPCObjectContainer::iterator> GetObjectIterator() { if (type != RPCObject) throw std::runtime_error("Cannot get iterator for a non-object RPC value"); diff --git a/src/users.cpp b/src/users.cpp index 5617715fd..b357fd149 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -878,7 +878,7 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, { New = new userrec(Instance); } - catch (CoreException &e) + catch (...) { Instance->Log(DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed."); Instance->WriteOpers("*** WARNING *** Duplicate UUID allocated!"); diff --git a/win/m_spanningtreeVC80.vcproj b/win/m_spanningtreeVC80.vcproj index 8336e6f6f..a53f3bd50 100644 --- a/win/m_spanningtreeVC80.vcproj +++ b/win/m_spanningtreeVC80.vcproj @@ -146,7 +146,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib"
+ AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
OutputFile="$(OutDir)/m_spanningtree.so"
LinkIncremental="1"
AdditionalLibraryDirectories="..\bin\release\bin;..\bin\release\lib"
|