diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2014-05-25 19:57:45 -0700 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2014-05-25 19:57:45 -0700 |
| commit | 743b3f9410eee4f5bf2055c3673826ca17b5d67e (patch) | |
| tree | cca98bb207bdbc5161bbae03eb8ccad2ede5472e | |
| parent | 33a580d299413277f53f432f05ea0700e05fef5d (diff) | |
Cleaning a few more warnings out.
| -rw-r--r-- | src/BLua.cc | 2 | ||||
| -rw-r--r-- | src/BWebSocket.cc | 2 | ||||
| -rw-r--r-- | src/HelperTasks.cc | 2 | ||||
| -rw-r--r-- | win32/project/c-ares.vcxproj | 12 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/BLua.cc b/src/BLua.cc index 8d6b3ee..fa519a9 100644 --- a/src/BLua.cc +++ b/src/BLua.cc @@ -296,7 +296,7 @@ int Balau::LuaStatics::callwrap(lua_State * __L, lua_CFunction func) { L.push((void *) &s_signature); r = L.yield(L.gettop()); } - catch (EAgain & e) { + catch (EAgain &) { L.error("The C callback from Lua has thrown an EAgain - you can't do that, you have to wrap it using Lua::yield. The application will now crash, because this task will stop, but the event in the EAgain will later try to wake it up."); } catch (GeneralException & e) { diff --git a/src/BWebSocket.cc b/src/BWebSocket.cc index 2faf9d9..7d6bf1c 100644 --- a/src/BWebSocket.cc +++ b/src/BWebSocket.cc @@ -251,7 +251,7 @@ void Balau::WebSocketWorker::Do() { error: disconnect(); } - catch (Balau::EAgain & e) { + catch (Balau::EAgain &) { taskSwitch(); } } diff --git a/src/HelperTasks.cc b/src/HelperTasks.cc index 074aa8d..3a80b82 100644 --- a/src/HelperTasks.cc +++ b/src/HelperTasks.cc @@ -38,7 +38,7 @@ void Balau::CopyTask::Do() { } } } - catch (EAgain & e) { + catch (EAgain &) { taskSwitch(); } } diff --git a/win32/project/c-ares.vcxproj b/win32/project/c-ares.vcxproj index 6dcd6af..eec100f 100644 --- a/win32/project/c-ares.vcxproj +++ b/win32/project/c-ares.vcxproj @@ -87,7 +87,8 @@ <Optimization>Disabled</Optimization>
<SDLCheck>false</SDLCheck>
<AdditionalIncludeDirectories>..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers</AdditionalIncludeDirectories>
- <UndefinePreprocessorDefinitions>CARES_BUILDING_LIBRARY;CARES_STATICLIB;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
+ <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
+ <PreprocessorDefinitions>CARES_BUILDING_LIBRARY;CARES_STATICLIB;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -99,7 +100,8 @@ <Optimization>Disabled</Optimization>
<SDLCheck>false</SDLCheck>
<AdditionalIncludeDirectories>..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers</AdditionalIncludeDirectories>
- <UndefinePreprocessorDefinitions>CARES_BUILDING_LIBRARY;CARES_STATICLIB;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
+ <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
+ <PreprocessorDefinitions>CARES_BUILDING_LIBRARY;CARES_STATICLIB;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -113,7 +115,8 @@ <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>false</SDLCheck>
<AdditionalIncludeDirectories>..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers</AdditionalIncludeDirectories>
- <UndefinePreprocessorDefinitions>CARES_BUILDING_LIBRARY;CARES_STATICLIB;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
+ <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
+ <PreprocessorDefinitions>CARES_BUILDING_LIBRARY;CARES_STATICLIB;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -129,7 +132,8 @@ <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>false</SDLCheck>
<AdditionalIncludeDirectories>..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers</AdditionalIncludeDirectories>
- <UndefinePreprocessorDefinitions>CARES_BUILDING_LIBRARY;CARES_STATICLIB;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
+ <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
+ <PreprocessorDefinitions>CARES_BUILDING_LIBRARY;CARES_STATICLIB;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
|