Skip to content

Commit 208d9f7

Browse files
authored
Merge branch 'master' into mblome-conform
2 parents 59d1107 + 046705f commit 208d9f7

146 files changed

Lines changed: 5158 additions & 5772 deletions

File tree

Some content is hidden

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

docs/TOC.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# [Visual C++ in Visual Studio 2017 RC](visual-cpp-in-visual-studio.md)
22
# [What's New for Visual C++ in Visual Studio 2017 RC](what-s-new-for-visual-cpp-in-visual-studio.md)
33
# [C++ conformance improvements in Visual Studio 2017](cpp-conformance-improvements-2017.md)
4+
## [Visual C++ Language Conformance](visual-cpp-language-conformance.md)
45
# [Supported Platforms (Visual C++)](supported-platforms-visual-cpp.md)
56
# [C Language](c-language/c-language-reference.md)
67
# [C++ Language](cpp/cpp-language-reference.md)

docs/cpp-conformance-improvements-2017.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ translation.priority.ht:
2727
- "zh-cn"
2828
- "zh-tw"
2929
---
30-
30+
3131
# C++ conformance improvements in [!INCLUDE[vs_dev15_md](misc/includes/vs_dev15_md.md)]
3232

3333
## New language features
@@ -343,4 +343,5 @@ void f(ClassLibrary1::Class1 ^r1, ClassLibrary1::Class2 ^r2)
343343
}
344344
```
345345

346-
346+
## See Also
347+
[Visual C++ Language Conformance](visual-cpp-language-conformance.md)

docs/cppcx/TOC.md

Lines changed: 115 additions & 301 deletions
Large diffs are not rendered by default.

docs/cppcx/agile-get-method.md

Lines changed: 0 additions & 49 deletions
This file was deleted.

docs/cppcx/agile-getaddressof-method.md

Lines changed: 0 additions & 54 deletions
This file was deleted.

docs/cppcx/agile-getaddressofforinout-method.md

Lines changed: 0 additions & 55 deletions
This file was deleted.

docs/cppcx/agile-release-method.md

Lines changed: 0 additions & 47 deletions
This file was deleted.

docs/cppcx/array-get-method.md

Lines changed: 0 additions & 48 deletions
This file was deleted.

docs/cppcx/array-value-property.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

docs/cppcx/box-value-property.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)