Skip to content

Commit 4d69bc1

Browse files
ghogenghogen
authored
Merge branch 'master' into mb-conformfix
2 parents fd3f0be + 9bc5171 commit 4d69bc1

6 files changed

Lines changed: 136 additions & 107 deletions

‎docs/cpp-conformance-improvements-2017.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ translation.priority.ht:
3131
# C++ conformance improvements in [!INCLUDE[vs_dev15_md](misc/includes/vs_dev15_md.md)]
3232

3333
## New language features
34-
With support for generalized constexpr and NSDMI for aggregates, the compiler is now complete for features added in the C++14 Standard. Note that the compiler still lacks a few features from the C++11 and C++98 Standards.
34+
With support for generalized constexpr and NSDMI for aggregates, the compiler is now complete for features added in the C++14 Standard. Note that the compiler still lacks a few features from the C++11 and C++98 Standards. See [Visual C++ Language Conformance](visual-cpp-language-conformance.md) for a table that shows the current state of the compiler.
3535

3636
### C++11:
3737
**Expression SFINAE support in more libraries**

‎docs/data/index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ Since 2011 Microsoft has aligned on ODBC as the standard for native applications
198198
<div class="card">
199199
<div class="cardText">
200200
<h3><a href="https://www.microsoft.com/download/details.aspx?id=53339" title="Microsoft® ODBC Driver 13.1 for SQL Server® - Windows Download Page">ODBC Driver 13.1 for SQL Server</a></h3>
201+
<p>The Microsoft ODBC Driver 13.1 for SQL Server is a single dynamic-link library (DLL) containing run-time support for applications using native-code APIs to connect to Microsoft SQL Server 2008, SQL Server 2008 R2, SQL Server 2012, SQL Server 2016, Analytics Platform System, Azure SQL Database and Azure SQL Data Warehouse. Download the driver here.</p>
201202
</div>
202203
</div>
203204
</div>

‎docs/ide/deploying-visual-cpp-application-by-using-the-vcpp-redistributable-package.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ This step-by-step article describes how to use the Visual C++ Redistributable Pa
4848

4949
2. Create a file, name it setup.bat, and add the following commands to it. Change `MyMFCApplication` to the name of your project.
5050

51-
```
52-
53-
@echo off
51+
```cmd
52+
@echo off
5453
vcredist_x86.exe
5554
mkdir "C:\Program Files\MyMFCApplication"
5655
copy MyMFCApplication.exe "C:\Program Files\MyMFCApplication"

0 commit comments

Comments
 (0)