Skip to content

Commit cfd9ebe

Browse files
ras0219-msftras0219-msft
committed
Adding support for clang 3.6 by suppressing new warnings
1 parent e83d8b9 commit cfd9ebe

File tree

8 files changed

+50
-19
lines changed

8 files changed

+50
-19
lines changed

‎Release/include/cpprest/details/SafeInt3.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ Please read the leading comments before using the class.
122122
#pragma clang diagnostic push
123123
#pragma clang diagnostic ignored "-Wc++11-long-long"
124124
#pragma clang diagnostic ignored "-Wold-style-cast"
125+
#pragma clang diagnostic ignored "-Wunused-local-typedef"
125126
#endif
126127

127128
#endif

‎Release/include/cpprest/details/x509_cert_utilities.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,14 @@
3434
#pragma warning(push)
3535
#pragma warning(disable : 4005)
3636
#endif
37+
#if defined(__clang__)
38+
#pragma clang diagnostic push
39+
#pragma clang diagnostic ignored "-Wunused-local-typedef"
40+
#endif
3741
#include <boost/asio/ssl.hpp>
42+
#if defined(__clang__)
43+
#pragma clang diagnostic pop
44+
#endif
3845
#if defined(_MSC_VER)
3946
#pragma warning(pop)
4047
#endif

‎Release/src/build/package_info.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<package>
22
<metadata>
33
<base_id>cpprestsdk</base_id>
4-
<version>2.6.0</version>
4+
<version>2.6.0.1</version>
55
<authors>casablancacore</authors>
66
<owners>Microsoft, Visual C++</owners>
77
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
@@ -17,7 +17,7 @@
1717
<headers>..\..\include</headers>
1818
<files>
1919
<file src="..\..\..\ThirdPartyNotices.txt" target="\license\ThirdPartyNotices.txt" />
20-
20+
2121
<!-- Needed to install our debugger natvis -->
2222
<file src="init.ps1" target="\tools\init.ps1" />
2323
<file src="cpprest.natvis" target="\tools\cpprest.natvis" />
@@ -28,10 +28,10 @@
2828
<AdditionalOptions Condition="'$(PlatformToolset)'=='v140'">/d2notypeopt %(AdditionalOptions)</AdditionalOptions>
2929
<PreprocessorDefinitions Condition="'$(PlatformToolset)' == 'v120_xp'">CPPREST_TARGET_XP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
3030
<!-- Workaround Visual Studio Android bug missing -funwind-tables if -fexceptions is specified. -->
31-
<AdditionalOptions Condition="'$(PlatformToolset)' == 'Clang_3_4'">-funwind-tables %(AdditionalOptions)</AdditionalOptions>
31+
<AdditionalOptions Condition="'$(PlatformToolset)' == 'Clang_3_6'">-funwind-tables %(AdditionalOptions)</AdditionalOptions>
3232
</ClCompile>
3333
<Link>
34-
<LibraryDependencies Condition="'$(PlatformToolset)' == 'Clang_3_4'">m;%(LibraryDependencies)</LibraryDependencies>
34+
<LibraryDependencies Condition="'$(PlatformToolset)' == 'Clang_3_6'">m;%(LibraryDependencies)</LibraryDependencies>
3535
</Link>
3636
</ItemDefinitionGroup>
3737
</msbuild_hook>

‎Release/src/build/vs14.android/casablanca140.android.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,25 @@
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
3535
<ConfigurationType>StaticLibrary</ConfigurationType>
3636
<UseDebugLibraries>true</UseDebugLibraries>
37-
<PlatformToolset>Clang_3_4</PlatformToolset>
37+
<PlatformToolset>Clang_3_6</PlatformToolset>
3838
<UseOfStl>gnustl_static</UseOfStl>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
4141
<ConfigurationType>StaticLibrary</ConfigurationType>
4242
<UseDebugLibraries>true</UseDebugLibraries>
43-
<PlatformToolset>Clang_3_4</PlatformToolset>
43+
<PlatformToolset>Clang_3_6</PlatformToolset>
4444
<UseOfStl>gnustl_static</UseOfStl>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
4747
<ConfigurationType>StaticLibrary</ConfigurationType>
4848
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>Clang_3_4</PlatformToolset>
49+
<PlatformToolset>Clang_3_6</PlatformToolset>
5050
<UseOfStl>gnustl_static</UseOfStl>
5151
</PropertyGroup>
5252
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
5353
<ConfigurationType>StaticLibrary</ConfigurationType>
5454
<UseDebugLibraries>false</UseDebugLibraries>
55-
<PlatformToolset>Clang_3_4</PlatformToolset>
55+
<PlatformToolset>Clang_3_6</PlatformToolset>
5656
<UseOfStl>gnustl_static</UseOfStl>
5757
</PropertyGroup>
5858
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -73,7 +73,7 @@
7373
<CppLanguageStandard>c++11</CppLanguageStandard>
7474
<RuntimeTypeInfo>true</RuntimeTypeInfo>
7575
<TreatWarningAsError>true</TreatWarningAsError>
76-
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
76+
<AdditionalOptions>-funwind-tables -Wno-unused-local-typedef </AdditionalOptions>
7777
</ClCompile>
7878
</ItemDefinitionGroup>
7979
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -84,7 +84,7 @@
8484
<ExceptionHandling>Enabled</ExceptionHandling>
8585
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8686
<TreatWarningAsError>true</TreatWarningAsError>
87-
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
87+
<AdditionalOptions>-funwind-tables -Wno-unused-local-typedef </AdditionalOptions>
8888
</ClCompile>
8989
</ItemDefinitionGroup>
9090
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -95,7 +95,7 @@
9595
<ExceptionHandling>Enabled</ExceptionHandling>
9696
<RuntimeTypeInfo>true</RuntimeTypeInfo>
9797
<TreatWarningAsError>true</TreatWarningAsError>
98-
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
98+
<AdditionalOptions>-funwind-tables -Wno-unused-local-typedef </AdditionalOptions>
9999
</ClCompile>
100100
</ItemDefinitionGroup>
101101
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
@@ -106,7 +106,7 @@
106106
<ExceptionHandling>Enabled</ExceptionHandling>
107107
<RuntimeTypeInfo>true</RuntimeTypeInfo>
108108
<TreatWarningAsError>true</TreatWarningAsError>
109-
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
109+
<AdditionalOptions>-funwind-tables -Wno-unused-local-typedef </AdditionalOptions>
110110
</ClCompile>
111111
</ItemDefinitionGroup>
112112
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">

‎Release/src/build/vs14.android/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="boost" version="1.55.0.16" targetFramework="Native" />
4-
<package id="boost_atomic-android" version="1.55.0.0" targetFramework="Native" />
5-
<package id="boost_chrono-android" version="1.55.0.0" targetFramework="Native" />
6-
<package id="boost_date_time-android" version="1.55.0.0" targetFramework="Native" />
7-
<package id="boost_filesystem-android" version="1.55.0.0" targetFramework="Native" />
8-
<package id="boost_system-android" version="1.55.0.0" targetFramework="Native" />
9-
<package id="boost_thread-android" version="1.55.0.0" targetFramework="Native" />
10-
<package id="openssl-android" version="1.0.1" targetFramework="Native" />
4+
<package id="boost_atomic-android" version="1.55.0.1" targetFramework="native" />
5+
<package id="boost_chrono-android" version="1.55.0.1" targetFramework="native" />
6+
<package id="boost_date_time-android" version="1.55.0.1" targetFramework="native" />
7+
<package id="boost_filesystem-android" version="1.55.0.1" targetFramework="native" />
8+
<package id="boost_system-android" version="1.55.0.1" targetFramework="native" />
9+
<package id="boost_thread-android" version="1.55.0.1" targetFramework="native" />
10+
<package id="openssl-android" version="1.0.2.0" targetFramework="native" />
1111
</packages>

‎Release/src/http/client/http_client_asio.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,16 @@
2727

2828
#include "stdafx.h"
2929

30+
#if defined(__clang__)
31+
#pragma clang diagnostic push
32+
#pragma clang diagnostic ignored "-Wunused-local-typedef"
33+
#endif
3034
#include <boost/asio.hpp>
3135
#include <boost/asio/ssl.hpp>
3236
#include <boost/algorithm/string.hpp>
37+
#if defined(__clang__)
38+
#pragma clang diagnostic pop
39+
#endif
3340

3441
#if defined(BOOST_NO_CXX11_SMART_PTR)
3542
#error "Cpp rest SDK requires c++11 smart pointer support from boost"

‎Release/src/pch/stdafx.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525

2626
#pragma once
2727

28+
#if defined(__clang__)
29+
#pragma clang diagnostic push
30+
#pragma clang diagnostic ignored "-Wunused-local-typedef"
31+
#endif
32+
2833
#include "cpprest/details/cpprest_compat.h"
2934
#include "cpprest/details/basic_types.h"
3035

@@ -160,3 +165,7 @@
160165
#if defined(min)
161166
#error: min macro defined -- make sure to #define NOMINMAX before including windows.h
162167
#endif
168+
169+
#if defined(__clang__)
170+
#pragma clang diagnostic pop
171+
#endif

‎Release/src/utilities/asyncrt_utils.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,15 @@
2626
#include "stdafx.h"
2727

2828
#ifndef _WIN32
29+
#if defined(__clang__)
30+
#pragma clang diagnostic push
31+
#pragma clang diagnostic ignored "-Wunused-local-typedef"
32+
#endif
2933
#include <boost/date_time/posix_time/posix_time.hpp>
3034
#include <boost/date_time/posix_time/posix_time_io.hpp>
35+
#if defined(__clang__)
36+
#pragma clang diagnostic pop
37+
#endif
3138
#endif
3239

3340
// Could use C++ standard library if not __GLIBCXX__,

0 commit comments

Comments
 (0)