Skip to content

Commit 8630a5c

Browse files
ghogenghogen
authored
Merge branch 'live' into master
2 parents 6e0f2d2 + ae23be0 commit 8630a5c

5 files changed

Lines changed: 7 additions & 4 deletions

File tree

‎docs/porting/porting-third-party-libraries.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ translation.priority.ht:
3333
- "zh-cn"
3434
- "zh-tw"
3535
---
36+
3637
# Porting third-party libraries
38+
3739
When you upgrade a project to the current version of Visual C++, you also have to upgrade any libraries that the project uses, so that the library and your project are built with the same version and flavor of the compiler. (For more information, see [Overview of potential upgrade issues](overview-of-potential-upgrade-issues-visual-cpp.md)).
3840

3941
## Introducing vcpkg

‎docs/porting/visual-cpp-porting-and-upgrading-guide.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ This topic provides a guide for upgrading Visual C++ code. This includes getting
9292

9393
|Title|Description|
9494
|-----------|-----------------|
95-
|[Upgrading Projects from Earlier Versions of Visual C++](upgrading-projects-from-earlier-versions-of-visual-cpp.md)|Discusses how to use projects created in earlier versions of Visual C++.|
95+
|[Upgrading Projects from Earlier Versions of Visual C++](upgrading-projects-from-earlier-versions-of-visual-cpp.md)|Discusses how to use projects created in earlier versions of Visual C++.|
9696
|[What's New for Visual C++ in Visual Studio 2017 RC](what-s-new-for-visual-cpp-in-visual-studio.md)|Changes in the IDE and tools from Visual Studio 2015 to Visual Studio 2017|
9797
|[C++ conformance improvements in Visual Studio 2017](cpp-conformance-improvements-2017.md)|Standards conformance improvements from Visual Studio 2015 to Visual Studio 2017|
9898
|[Visual C++ change history 2003 - 2015](visual-cpp-change-history-2003-2015.md)|A list of all the changes in the Visual C++ libraries and build tools from Visual Studio 2003 through 2015 that might require changes in your code.|
@@ -101,7 +101,7 @@ This topic provides a guide for upgrading Visual C++ code. This includes getting
101101
|[Porting and Upgrading: Examples and Case Studies](porting-and-upgrading-examples-and-case-studies.md)|For this section, we ported and upgrades several samples and applications and discussed the experiences and results. You might find that reading these gives you a sense of what is involved in the porting and upgrading process. Throughout the process, we discuss tips and tricks for upgrading and show how specific errors were fixed.|
102102
|[Porting to the Universal Windows Platform](porting-to-the-universal-windows-platform-cpp.md)|Contains information about porting code to Windows 10|
103103
|[Introduction to Visual C++ for UNIX Users](introduction-to-visual-cpp-for-unix-users.md)|Provides information for UNIX users who are new to [!INCLUDE[vcprvc](../build/includes/vcprvc_md.md)] and want to become productive with it.|
104-
|[Porting from UNIX to Win32](porting-from-unix-to-win32.md)|Discusses options for migrating UNIX applications to Windows.|
104+
|[Porting from UNIX to Win32](porting-from-unix-to-win32.md)|Discusses options for migrating UNIX applications to Windows.|
105105
|[C++/CLI Migration Primer](../dotnet/cpp-cli-migration-primer.md)|Shows in detail how to upgrade your Managed Extensions for C++ syntax to use the new syntax. For more information, see [Component Extensions for Runtime Platforms](../windows/component-extensions-for-runtime-platforms.md).|
106106

107107
## See Also

‎docs/standard-library/add-cv-class.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ invoked const volatile S.f()
106106

107107
## Requirements
108108
**Header:** \<type_traits>
109-
110109
**Namespace:** std
111110

112111
## See Also

‎docs/standard-library/add-volatile-class.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ add_volatile<int> == int
8080
```
8181

8282
## Requirements
83+
8384
**Header:** \<type_traits>
8485

8586
**Namespace:** std

‎docs/standard-library/integral-constant-class-bool-constant-class.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ integral_constant<bool, false> == false
9797
```
9898

9999
## Requirements
100-
**Header:** \<type_traits>
100+
101+
**Header:** \<type_traits>
101102

102103
**Namespace:** std
103104

0 commit comments

Comments
 (0)