Skip to content

Commit 391223f

Browse files
author
Colin Robertson
authored
Merge pull request #836 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
2 parents cb1a243 + 3bb7c1c commit 391223f

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

docs/build/filename-macros.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Filename macros are predefined as filenames specified in the dependency (not ful
1818
|-----------|-------------|
1919
|**$@**|Current target's full name (path, base name, extension), as currently specified.|
2020
|**$$@**|Current target's full name (path, base name, extension), as currently specified. Valid only as a dependent in a dependency.|
21-
|**$\***|Current target's path and base name minus file extension.|
22-
|**$\*\***|All dependents of the current target.|
21+
|**$***|Current target's path and base name minus file extension.|
22+
|**$****|All dependents of the current target.|
2323
|**$?**|All dependents with a later timestamp than the current target.|
2424
|**$<**|Dependent file with a later timestamp than the current target. Valid only in commands in inference rules.|
2525

@@ -33,4 +33,4 @@ Filename macros are predefined as filenames specified in the dependency (not ful
3333
|**R**|Drive plus directory plus base name|
3434

3535
## See Also
36-
[Special NMAKE Macros](../build/special-nmake-macros.md)
36+
[Special NMAKE Macros](../build/special-nmake-macros.md)

docs/error-messages/compiler-errors-2/compiler-error-c3533.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@ ms.workload: ["cplusplus"]
2222
1. Remove the `auto` keyword from the parameter declaration.
2323

2424
## Example
25-
The following example yields C3535 because it declares a function parameter with the `auto` keyword and it is compiled with **/Zc:auto**.
25+
The following example yields C3533 because it declares a function parameter with the `auto` keyword and it is compiled with **/Zc:auto**.
2626

2727
```
2828
// C3533a.cpp
2929
// Compile with /Zc:auto
30-
void f(auto j){} // C3533
30+
void f(auto j) {} // C3533
3131
```
3232

3333
## Example
34-
The following example yields C3535 because it declares a template parameter with the `auto` keyword and it is compiled with **/Zc:auto**.
34+
The following example yields C3533 in C++14 mode because it declares a template parameter with the `auto` keyword and it is compiled with **/Zc:auto**. (In C++17, this is a valid definition of a class template with a single non-type template parameter whose type is deduced.)
3535

3636
```
3737
// C3533b.cpp
3838
// Compile with /Zc:auto
39-
template<auto T> class C{}; // C3533
39+
template<auto T> class C {}; // C3533
4040
```
4141

4242
## See Also
4343
[auto Keyword](../../cpp/auto-keyword.md)
44-
[/Zc:auto (Deduce Variable Type)](../../build/reference/zc-auto-deduce-variable-type.md)
44+
[/Zc:auto (Deduce Variable Type)](../../build/reference/zc-auto-deduce-variable-type.md)

docs/standard-library/system-clock-structure.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ A clock is *monotonic* if the value that is returned by a first call to `now()`
2929

3030
A clock is *steady* if it is *monotonic* and if the time between clock ticks is constant.
3131

32-
In this implementation, a `system_clock` is synonymous with a `high_resolution_clock`.
33-
3432
## Members
3533

3634
### Public Typedefs

0 commit comments

Comments
 (0)