Skip to content

Commit 7f07a0e

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/cpp-docs-pr (branch live)
2 parents 3a57514 + cbc50b1 commit 7f07a0e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

docs/build/reference/nmake-function-patsubst.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ $(patsubst %lo,Bye,Hello Hey Hi) # Evaluates to "Bye Hey Hi"
4949
# A wildcard can be used in the pattern without a wildcard in the replacement
5050

5151
$(patsubst he%,_%_,Hello Hey Hi) # Evaluates to "Hello Hey Hi" - patsubst is case-sensitive, so no substitutions performed
52-
$(patsubst he%,_%_,Hello Hey Hi) # Evaluates to "_llo_ _y_ Hi" - patsubsti is case-insensitive
52+
$(patsubsti he%,_%_,Hello Hey Hi) # Evaluates to "_llo_ _y_ Hi" - patsubsti is case-insensitive
5353

5454
# patsubsti is commonly used to change the file extensions of a list of files
5555
OBJ_FILES=$(patsubst %.c,%.obj,$(C_SOURCES)) $(patsubst %.cpp,%.obj,$(patsubst %.cxx,%.obj,$(CPP_SOURCES)))

docs/cpp/new-operator-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ The **`new`** operator can't be used to allocate a function, but it can be used
6565

6666
```cpp
6767
int (**p) () = new (int (*[7]) ());
68-
delete *p;
68+
delete p;
6969
```
7070

7171
If you use the operator **`new`** without any extra arguments, and compile with the [`/GX`](../build/reference/gx-enable-exception-handling.md), [`/EHa`](../build/reference/eh-exception-handling-model.md), or [`/EHs`](../build/reference/eh-exception-handling-model.md) option, the compiler generates code to call operator **`delete`** if the constructor throws an exception.

docs/preprocessor/pragma-directives-and-the-pragma-keyword.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ return _hr; \
131131
132132
`_Pragma` is similar to the Microsoft-specific [`__pragma`](#the-pragma-keyword) keyword. It was introduced into the C standard in C99, and the C++ standard in C++11. It's available in C only when you specify the [`/std:c11` or `/std:c17`](../build/reference/std-specify-language-standard-version.md) option. For C++, it's available in all **`/std`** modes, including the default.
133133
134-
Unlike **`__pragma`**, **`_Pragma`** allows you to put pragma directives into a macro definition. The string literal should be what you would otherwise put following a **`#pragma`** statement. For example:
134+
Unlike **`#pragma`**, **`_Pragma`** allows you to put pragma directives into a macro definition. The string literal should be what you would otherwise put following a **`#pragma`** statement. For example:
135135
136136
```c
137137
#pragma message("the #pragma way")

0 commit comments

Comments
 (0)