Skip to content

Commit d630e40

Browse files
ghogenghogen
authored
Merge branch 'master' into cppwave2
2 parents 0c247f5 + c267e6b commit d630e40

File tree

113 files changed

+247
-249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+247
-249
lines changed

‎docs/assembler/masm/masm-for-x64-ml64-exe.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ translation.priority.ht:
3434
- "zh-tw"
3535
---
3636
# MASM for x64 (ml64.exe)
37-
ml64.exe is the assembler that accepts [!INCLUDE[vcprx64](../../assembler/inline/includes/vcprx64_md.md)] assembly language. For information on ml64.exe compiler options, see [ML and ML64 Command-Line Reference](../../assembler/masm/ml-and-ml64-command-line-reference.md).
37+
ml64.exe is the assembler that accepts x64 assembly language. For information on ml64.exe compiler options, see [ML and ML64 Command-Line Reference](../../assembler/masm/ml-and-ml64-command-line-reference.md).
3838

39-
Inline ASM is not supported for [!INCLUDE[vcprx64](../../assembler/inline/includes/vcprx64_md.md)]. Use MASM or compiler intrinsics ([x64 Intrinsics](http://msdn.microsoft.com/en-us/5d1f5d3e-156e-4ebf-932e-fd09be7ced62)).
39+
Inline ASM is not supported for x64. Use MASM or compiler intrinsics ([x64 (amd64) Intrinsics List](../../intrinsics/x64-amd64-intrinsics-list.md)).
4040

4141
The two workarounds are separate assembly with MASM (which supports x64 fully) and compiler intrinsics. We’ve added a lot of intrinsics to allow customers to make use of special-function instructions (e.g. privileged, bit scan/test, interlocked, etc…) in as close to cross-platform a manner as possible.
4242

‎docs/build/TOC.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# [Building C-C++ Programs](building-c-cpp-programs.md)
2-
# [Building C-C++ Isolated Applications and Side-by-side Assemblies](building-c-cpp-isolated-applications-and-side-by-side-assemblies.md)
1+
# [Building C/C++ Programs](building-c-cpp-programs.md)
2+
# [Building C/C++ Isolated Applications and Side-by-side Assemblies](building-c-cpp-isolated-applications-and-side-by-side-assemblies.md)
33
## [Concepts of Isolated Applications and Side-by-side Assemblies](concepts-of-isolated-applications-and-side-by-side-assemblies.md)
4-
## [Building C-C++ Isolated Applications](building-c-cpp-isolated-applications.md)
5-
## [Building C-C++ Side-by-side Assemblies](building-c-cpp-side-by-side-assemblies.md)
4+
## [Building C/C++ Isolated Applications](building-c-cpp-isolated-applications.md)
5+
## [Building C/C++ Side-by-side Assemblies](building-c-cpp-side-by-side-assemblies.md)
66
## [How to: Build Registration-Free COM Components](how-to-build-registration-free-com-components.md)
77
## [How to: Build Isolated Applications to Consume COM Components](how-to-build-isolated-applications-to-consume-com-components.md)
8-
## [Understanding Manifest Generation for C-C++ Programs](understanding-manifest-generation-for-c-cpp-programs.md)
8+
## [Understanding Manifest Generation for C/C++ Programs](understanding-manifest-generation-for-c-cpp-programs.md)
99
### [Manifest Generation in Visual Studio](manifest-generation-in-visual-studio.md)
1010
### [Manifest Generation at the Command Line](manifest-generation-at-the-command-line.md)
11-
### [How to: Embed a Manifest Inside a C-C++ Application](how-to-embed-a-manifest-inside-a-c-cpp-application.md)
12-
## [Troubleshooting C-C++ Isolated Applications and Side-by-side Assemblies](troubleshooting-c-cpp-isolated-applications-and-side-by-side-assemblies.md)
11+
### [How to: Embed a Manifest Inside a C/C++ Application](how-to-embed-a-manifest-inside-a-c-cpp-application.md)
12+
## [Troubleshooting C/C++ Isolated Applications and Side-by-side Assemblies](troubleshooting-c-cpp-isolated-applications-and-side-by-side-assemblies.md)
1313
# [Configuring Programs for 64-Bit (Visual C++)](configuring-programs-for-64-bit-visual-cpp.md)
1414
## [How to: Configure Visual C++ Projects to Target 64-Bit Platforms](how-to-configure-visual-cpp-projects-to-target-64-bit-platforms.md)
1515
## [How to: Enable a 64-Bit Visual C++ Toolset on the Command Line](how-to-enable-a-64-bit-visual-cpp-toolset-on-the-command-line.md)

‎docs/build/building-c-cpp-isolated-applications-and-side-by-side-assemblies.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Building C-C++ Isolated Applications and Side-by-side Assemblies | Microsoft Docs"
2+
title: "Building C/C++ Isolated Applications and Side-by-side Assemblies | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""

‎docs/build/building-c-cpp-isolated-applications.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Building C-C++ Isolated Applications | Microsoft Docs"
2+
title: "Building C/C++ Isolated Applications | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""

‎docs/build/building-c-cpp-programs.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Building C-C++ Programs | Microsoft Docs"
2+
title: "Building C/C++ Programs | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""

‎docs/build/building-c-cpp-side-by-side-assemblies.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Building C-C++ Side-by-side Assemblies | Microsoft Docs"
2+
title: "Building C/C++ Side-by-side Assemblies | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""

‎docs/build/configuring-programs-for-64-bit-visual-cpp.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ This section contains topics about targeting 64-bit hardware with the Visual C++
5454

5555
[align](../cpp/align-cpp.md)
5656

57-
[/clr (Common Language Runtime Compilation)](../build/reference/clr-common-language-runtime-compilation.md) for information on how to run an application compiled with **/clr:safe** under WOW64 on a 64-bit operating system.
57+
[/clr (Common Language Runtime Compilation)](../build/reference/clr-common-language-runtime-compilation.md)
5858

5959
[/favor (Optimize for Architecture Specifics)](../build/reference/favor-optimize-for-architecture-specifics.md)
6060

6161
[Programming Guide for 64-bit Windows](http://msdn.microsoft.com/library/windows/desktop/bb427430)
6262

6363
[MASM for x64 (ml64.exe)](../assembler/masm/masm-for-x64-ml64-exe.md)
6464

65-
[x64 Intrinsics](http://msdn.microsoft.com/en-us/5d1f5d3e-156e-4ebf-932e-fd09be7ced62)
65+
[x64 (amd64) Intrinsics List](../intrinsics/x64-amd64-intrinsics-list.md)
6666

6767
## See Also
68-
[(NOTINBUILD)Visual C++ Programming Methodologies](http://msdn.microsoft.com/en-us/0822f806-fa81-4b65-bf0f-1e2921f30c95)
68+
[Building C/C++ Programs](building-c-cpp-programs.md)

‎docs/build/how-to-embed-a-manifest-inside-a-c-cpp-application.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "How to: Embed a Manifest Inside a C-C++ Application | Microsoft Docs"
2+
title: "How to: Embed a Manifest Inside a C/C++ Application | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""

‎docs/build/reference/TOC.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# [C-C++ Building Reference](c-cpp-building-reference.md)
2-
# [Compiling a C-C++ Program](compiling-a-c-cpp-program.md)
1+
# [C/C++ Building Reference](c-cpp-building-reference.md)
2+
# [Compiling a C/C++ Program](compiling-a-c-cpp-program.md)
33
## [Setting Compiler Options](setting-compiler-options.md)
44
### [Compiler Command-Line Syntax](compiler-command-line-syntax.md)
55
#### [CL Filename Syntax](cl-filename-syntax.md)
@@ -27,7 +27,7 @@
2727
##### [-clr Restrictions](clr-restrictions.md)
2828
#### [-D (Preprocessor Definitions)](d-preprocessor-definitions.md)
2929
#### [-diagnostics (Compiler diagnostics options)](diagnostics-compiler-diagnostic-options.md)
30-
#### [-doc (Process Documentation Comments) (C-C++)](doc-process-documentation-comments-c-cpp.md)
30+
#### [-doc (Process Documentation Comments) (C/C++)](doc-process-documentation-comments-c-cpp.md)
3131
#### [-E (Preprocess to stdout)](e-preprocess-to-stdout.md)
3232
#### [-EH (Exception Handling Model)](eh-exception-handling-model.md)
3333
#### [-EP (Preprocess to stdout Without #line Directives)](ep-preprocess-to-stdout-without-hash-line-directives.md)
@@ -80,7 +80,7 @@
8080
#### [-LN (Create MSIL Module)](ln-create-msil-module.md)
8181
#### [-MD, -MT, -LD (Use Run-Time Library)](md-mt-ld-use-run-time-library.md)
8282
#### [-MP (Build with Multiple Processes)](mp-build-with-multiple-processes.md)
83-
#### [-nologo (Suppress Startup Banner) (C-C++)](nologo-suppress-startup-banner-c-cpp.md)
83+
#### [-nologo (Suppress Startup Banner) (C/C++)](nologo-suppress-startup-banner-c-cpp.md)
8484
#### [-O Options (Optimize Code)](o-options-optimize-code.md)
8585
##### [-O1, -O2 (Minimize Size, Maximize Speed)](o1-o2-minimize-size-maximize-speed.md)
8686
##### [-Ob (Inline Function Expansion)](ob-inline-function-expansion.md)
@@ -270,11 +270,11 @@
270270
#### [EXPORTS](exports.md)
271271
#### [LIBRARY](library.md)
272272
#### [HEAPSIZE](heapsize.md)
273-
#### [NAME (C-C++)](name-c-cpp.md)
274-
#### [SECTIONS (C-C++)](sections-c-cpp.md)
273+
#### [NAME (C/C++)](name-c-cpp.md)
274+
#### [SECTIONS (C/C++)](sections-c-cpp.md)
275275
#### [STACKSIZE](stacksize.md)
276276
#### [STUB](stub.md)
277-
#### [VERSION (C-C++)](version-c-cpp.md)
277+
#### [VERSION (C/C++)](version-c-cpp.md)
278278
## [Linker Support for Delay-Loaded DLLs](linker-support-for-delay-loaded-dlls.md)
279279
### [Specifying DLLs to Delay Load](specifying-dlls-to-delay-load.md)
280280
### [Explicitly Unloading a Delay-Loaded DLL](explicitly-unloading-a-delay-loaded-dll.md)
@@ -283,7 +283,7 @@
283283
### [Error Handling and Notification](error-handling-and-notification.md)
284284
#### [Notification Hooks](notification-hooks.md)
285285
#### [Failure Hooks](failure-hooks.md)
286-
#### [Exceptions (C-C++)](exceptions-c-cpp.md)
286+
#### [Exceptions (C/C++)](exceptions-c-cpp.md)
287287
### [Dumping Delay-Loaded Imports](dumping-delay-loaded-imports.md)
288288
### [Constraints of Delay Loading DLLs](constraints-of-delay-loading-dlls.md)
289289
### [Understanding the Helper Function](understanding-the-helper-function.md)
@@ -309,7 +309,7 @@
309309
## [Tips for Improving Time-Critical Code](tips-for-improving-time-critical-code.md)
310310
## [Using Function Name Without () Produces No Code](using-function-name-without-parens-produces-no-code.md)
311311
## [Optimization Best Practices](optimization-best-practices.md)
312-
# [C-C++ Build Tools](c-cpp-build-tools.md)
312+
# [C/C++ Build Tools](c-cpp-build-tools.md)
313313
## [BSCMAKE Reference](bscmake-reference.md)
314314
### [Building Browse Information Files: Overview](building-browse-information-files-overview.md)
315315
### [Building a .Bsc File](building-a-dot-bsc-file.md)

‎docs/build/reference/c-cpp-build-tools.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "C-C++ Build Tools | Microsoft Docs"
2+
title: "C/C++ Build Tools | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""

0 commit comments

Comments
 (0)