Skip to content

Commit 4b0fb9c

Browse files
authored
Merge pull request #3905 from corob-msft/docs/corob/bulk-entity-6
Remove HTML ehtities for hyphen
2 parents bcd92c8 + d31030a commit 4b0fb9c

9 files changed

+13
-13
lines changed

docs/build/reference/hint-files.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ The illustration shows some of the physical directories in a Visual Studio C++ p
155155

156156
### Hint File Directories
157157

158-
![Common and project-specific hint file directories.](media/hintfile.png "HintFile")
158+
![Diagram showing the common and project specific hint file directories.](media/hintfile.png)
159159

160160
### Directories and Hint File Contents
161161

docs/cpp/arrays-cpp.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ int i2[5][7];
164164

165165
It specifies an array of type **`int`**, conceptually arranged in a two-dimensional matrix of five rows and seven columns, as shown in the following figure:
166166

167-
![Conceptual layout of a multi dimensional array.](../cpp/media/vc38rc1.gif "Conceptual layout of a multi&#45;dimensional array") <br/>
167+
![Conceptual layout of a multi dimensional array.](../cpp/media/vc38rc1.gif) <br/>
168168
Conceptual layout of a multi-dimensional array
169169

170170
You can declare multidimensioned arrays that have an initializer list (as described in [Initializers](../cpp/initializers.md)). In these declarations, the constant expression that specifies the bounds for the first dimension can be omitted. For example:

docs/cpp/cpp-bit-fields.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ struct Date {
6262

6363
then the memory layout is as shown in the following figure:
6464

65-
![Layout of a Date object with a zero length bit field, which forces alignment padding.](../cpp/media/vc38uq2.png "Layout of Date object with zero&#45;length bit field") <br/>
65+
![Layout of a Date object with a zero length bit field, which forces alignment padding.](../cpp/media/vc38uq2.png) <br/>
6666
Layout of Date Object with Zero-Length Bit Field
6767

6868
The underlying type of a bit field must be an integral type, as described in [Built-in types](../cpp/fundamental-types-cpp.md).

docs/cpp/cpp-type-system-modern-cpp.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The fundamental types are recognized by the compiler, which has built-in rules t
5252

5353
The following illustration shows the relative sizes of the built-in types in the Microsoft C++ implementation:
5454

55-
![Diagram of the relative size in bytes of several built in types.](../cpp/media/built-intypesizes.png "Size in bytes of built&#45;in types")
55+
![Diagram of the relative size in bytes of several built in types.](../cpp/media/built-intypesizes.png)
5656

5757
The following table lists the most frequently used fundamental types, and their sizes in the Microsoft C++ implementation:
5858

docs/cpp/function-overloading.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ This same rule applies to pointer-to-member conversions. Conversion from type `T
283283

284284
The preceding rule applies only along a given path of derivation. Consider the graph shown in the following figure.
285285

286-
![Diagram of multiple inheritance that shows preferred conversions.](../cpp/media/vc391t2.gif "Multiple&#45;inheritance that shows preferred conversions") <br/>
286+
![Diagram of multiple inheritance that shows preferred conversions.](../cpp/media/vc391t2.gif) <br/>
287287
Multiple-inheritance graph that shows preferred conversions
288288

289289
Conversion from type `C*` to type `B*` is preferable to conversion from type `C*` to type `A*`. The reason is that they are on the same path, and `B*` is closer. However, conversion from type `C*` to type `D*` isn't preferable to conversion to type `A*`; there's no preference because the conversions follow different paths.

docs/cpp/multiple-base-classes.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Simulated lunch-line graph
4848
4949
In the figure, `Queue` is the base class for both `CashierQueue` and `LunchQueue`. However, when both classes are combined to form `LunchCashierQueue`, the following problem arises: the new class contains two subobjects of type `Queue`, one from `CashierQueue` and the other from `LunchQueue`. The following figure shows the conceptual memory layout (the actual memory layout might be optimized).
5050
51-
![Simulated lunch line object.](../cpp/media/vc38xp2.gif "Simulated lunch&#45;line object") <br/>
51+
![Simulated lunch line object.](../cpp/media/vc38xp2.gif) <br/>
5252
Simulated lunch-line object
5353
5454
Note that there are two `Queue` subobjects in the `LunchCashierQueue` object. The following code declares `Queue` to be a virtual base class:
@@ -64,17 +64,17 @@ class LunchCashierQueue : public LunchQueue, public CashierQueue {};
6464

6565
The **`virtual`** keyword ensures that only one copy of the subobject `Queue` is included (see the following figure).
6666

67-
![Simulated lunch line object, virtual base classes.](../cpp/media/vc38xp3.gif "Simulated lunch&#45;line object, virtual base classes") <br/>
67+
![Diagram showing a simulated lunch line object, with virtual base classes.](../cpp/media/vc38xp3.gif)<br/>
6868
Simulated lunch-line object with virtual base classes
6969

7070
A class can have both a virtual component and a nonvirtual component of a given type. This happens in the conditions illustrated in the following figure.
7171

72-
![Virtual and nonvirtual components of a class.](../cpp/media/vc38xp4.gif "Virtual and non&#45;virtual components of a class") <br/>
72+
![Diagram showing virtual and non virtual components of a class.](../cpp/media/vc38xp4.gif)<br/>
7373
Virtual and non-virtual components of the same class
7474

7575
In the figure, `CashierQueue` and `LunchQueue` use `Queue` as a virtual base class. However, `TakeoutQueue` specifies `Queue` as a base class, not a virtual base class. Therefore, `LunchTakeoutCashierQueue` has two subobjects of type `Queue`: one from the inheritance path that includes `LunchCashierQueue` and one from the path that includes `TakeoutQueue`. This is illustrated in the following figure.
7676

77-
![Virtual & nonvirtual inheritance in object layout.](../cpp/media/vc38xp5.gif "Virtual & non&#45;virtual inheritance in object layout") <br/>
77+
![Diagram showing virtual and non virtual inheritance in object layout.](../cpp/media/vc38xp5.gif)<br/>
7878
Object layout with virtual and non-virtual inheritance
7979

8080
> [!NOTE]
@@ -199,7 +199,7 @@ If virtual base classes are used, functions, objects, types, and enumerators can
199199
200200
The following figure shows how objects are composed using virtual and nonvirtual inheritance.
201201
202-
![Diagram showing virtual derivation and nonvirtual derivation.](../cpp/media/vc38xr1.gif "Virtual derivation and non&#45;virtual derivation") <br/>
202+
![Diagram showing virtual derivation and nonvirtual derivation.](../cpp/media/vc38xr1.gif)<br/>
203203
Virtual and non-virtual derivation
204204
205205
In the figure, accessing any member of class `A` through nonvirtual base classes causes an ambiguity; the compiler has no information that explains whether to use the subobject associated with `B` or the subobject associated with `C`. However, when `A` is specified as a virtual base class, there is no question which subobject is being accessed.

docs/cpp/scope-visual-cpp.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ There are six kinds of scope:
2929

3030
You can hide a name by declaring it in an enclosed block. In the following figure, `i` is redeclared within the inner block, thereby hiding the variable associated with `i` in the outer block scope.
3131

32-
![Diagram that shows block scope name hiding.](../cpp/media/vc38sf1.png "Block&#45;scope name hiding") <br/>
32+
![Diagram that shows block scope name hiding.](../cpp/media/vc38sf1.png)<br/>
3333
Block scope and name hiding
3434

3535
The output from the program shown in the figure is:

docs/cpp/single-inheritance.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 1cb946ed-8b1b-4cf1-bde0-d9cecbfdc622
99

1010
In "single inheritance," a common form of inheritance, classes have only one base class. Consider the relationship illustrated in the following figure.
1111

12-
![Diagram of a basic single inheritance hierarchy.](../cpp/media/vc38xj1.gif "Basic single&#45;inheritance graph") <br/>
12+
![Diagram of a basic single inheritance hierarchy.](../cpp/media/vc38xj1.gif)<br/>
1313
Simple Single-Inheritance Graph
1414

1515
Note the progression from general to specific in the figure. Another common attribute found in the design of most class hierarchies is that the derived class has a "kind of" relationship with the base class. In the figure, a `Book` is a kind of a `PrintedDocument`, and a `PaperbackBook` is a kind of a `book`.

docs/cpp/standard-conversions.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ The first case is when the specified base class is accessible and the conversion
181181

182182
Whether a base class is accessible depends on the kind of inheritance used in derivation. Consider the inheritance illustrated in the following figure.
183183

184-
![Inheritance graph showing base class accessibility.](../cpp/media/vc38xa1.gif "Inheritance graph showing base&#45;class accessibility") <br/>
184+
![Inheritance graph showing base class accessibility.](../cpp/media/vc38xa1.gif)<br/>
185185
Inheritance Graph for Illustration of Base-Class Accessibility
186186

187187
The following table shows the base-class accessibility for the situation illustrated in the figure.

0 commit comments

Comments
 (0)