Skip to content

Commit 946fe5d

Browse files
author
mikeblome
committed
misc edits related and unrelated
1 parent c45ed2a commit 946fe5d

5 files changed

Lines changed: 38 additions & 33 deletions

File tree

‎docs/cpp/basic-concepts-cpp.md‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Basic Concepts (C++)"
33
ms.custom: "index-page"
4-
ms.date: "11/04/2016"
4+
ms.date: "12/11/2019"
55
helpviewer_keywords: ["C++, basic language concepts"]
66
ms.assetid: 961801e6-2ffd-4bf1-bb71-7f55e48d9c79
77
---
@@ -10,25 +10,17 @@ ms.assetid: 961801e6-2ffd-4bf1-bb71-7f55e48d9c79
1010
This section explains concepts that are critical to understanding C++. C programmers will be familiar with many of these concepts, but there are some subtle differences that can cause unexpected program results. The following topics are included:
1111

1212
- [C++ type system](cpp-type-system-modern-cpp.md)
13-
14-
- [Declarations and definitions](../cpp/declarations-and-definitions-cpp.md)
15-
16-
- [Scope of a C++ object or function](../cpp/scope-visual-cpp.md)
17-
18-
- [Program definition and linkage rules](../cpp/program-and-linkage-cpp.md)
19-
20-
- [Startup and termination](../cpp/startup-and-termination-cpp.md)
21-
22-
- [L-values and r-values](../cpp/lvalues-and-rvalues-visual-cpp.md)
23-
24-
- [Temporary Objects](../cpp/temporary-objects.md)
25-
26-
- [Alignment](../cpp/alignment-cpp-declarations.md)
27-
28-
- [alignof and alignas](../cpp/alignof-and-alignas-cpp.md)
29-
30-
- [Trivial, standard-layout and POD types](../cpp/trivial-standard-layout-and-pod-types.md)
13+
- [Declarations and definitions](declarations-and-definitions-cpp.md)
14+
- [Scope](scope-visual-cpp.md)
15+
- [Translation units and linkage](program-and-linkage-cpp.md)
16+
- [main function and command-line arguments](main-function-command-line-args.md)
17+
- [Program termination](program-termination.md)
18+
- [Lvalues and rvalues](lvalues-and-rvalues-visual-cpp.md)
19+
- [Temporary objects](temporary-objects.md)
20+
- [Alignment](alignment-cpp-declarations.md)
21+
- [alignof and alignas](alignof-and-alignas-cpp.md)
22+
- [Trivial, standard-layout and POD types](trivial-standard-layout-and-pod-types.md)
3123

3224
## See also
3325

34-
[C++ Language Reference](../cpp/cpp-language-reference.md)
26+
[C++ Language Reference](cpp-language-reference.md)

‎docs/cpp/declarations-and-definitions-cpp.md‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
title: "Declarations and Definitions (C++)"
2+
title: "Declarations and definitions (C++)"
33
ms.date: "12/12/2019"
44
ms.assetid: 678f1424-e12f-45e0-a957-8169e5fef6cb
55
---
6-
# Declarations and Definitions (C++)
6+
# Declarations and definitions (C++)
77

88
A C++ program consists of various entities such as variables, functions, types, and namespaces. Each of these entities must be *declared* before they can be used. A declaration specifies a unique name for the entity, along with information about its type and other characteristics. In C++ the point at which a name is declared is the point at which it becomes visible to the compiler. You cannot refer to a function or class that is declared at some later point in the compilation unit. Variables should be declared as close as possible before the point at which they are used.
99

@@ -88,6 +88,18 @@ Because static class data members are discrete variables shared by all objects o
8888
8989
A C++ program might contain more than one [compilation unit](header-files-cpp.md). To declare an entity that is defined in a separate compilation unit, use the [extern](extern-cpp.md) keyword. The information in the declaration is sufficient for the compiler, but if the definition of the entity cannot be found in the linking step, then the linker will raise an error.
9090
91+
## In this section
92+
93+
[extern](extern-cpp.md)
94+
[Header files](header-files.md)
95+
[Initializers](initializers.md)
96+
[Aliases and typedefs](aliases-and-typedefs.md)
97+
[using declaration](using-declaration.md)
98+
[Storage classes]()
99+
[const]()
100+
[constexpr]()
101+
[volatile]()
102+
91103
## See also
92104
93105
[Basic Concepts](../cpp/basic-concepts-cpp.md)<br/>

‎docs/cpp/lexical-conventions.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
---
2-
title: "Lexical Conventions"
2+
title: "Lexical conventions"
3+
description: "Describes basic elements of C++ programs such as keywords, identifiers, literals, and character sets."
34
ms.custom: "index-page"
45
ms.date: "12/10/2019"
56
helpviewer_keywords: ["lexical conventions", "conventions, lexical"]
67
ms.assetid: 03f9efff-bb95-45ef-9157-0a3fac809ccf
78
---
8-
# Lexical Conventions
9+
# Lexical conventions
910

1011
This section introduces the fundamental elements of a C++ program. You use these elements, called "lexical elements" or "tokens" to construct statements, definitions, declarations, and so on, which are used to construct complete programs. The following lexical elements are discussed in this section:
1112

12-
- [Tokens and character Sets](../cpp/character-sets.md)
13+
- [Tokens and character sets](../cpp/character-sets.md)
1314
- [Comments](../cpp/comments-cpp.md)
1415
- [Identifiers](../cpp/identifiers-cpp.md)
1516
- [Keywords](../cpp/keywords-cpp.md)
1617
- [Punctuators](../cpp/punctuators-cpp.md)
17-
- [Numeric, Boolean, and Pointer Literals](../cpp/numeric-boolean-and-pointer-literals-cpp.md)
18-
- [String and Character Literals](../cpp/string-and-character-literals-cpp.md)
19-
- [User-Defined Literals](../cpp/user-defined-literals-cpp.md)
18+
- [Numeric, boolean, and pointer literals](../cpp/numeric-boolean-and-pointer-literals-cpp.md)
19+
- [String and character literals](../cpp/string-and-character-literals-cpp.md)
20+
- [User-defined literals](../cpp/user-defined-literals-cpp.md)
2021

2122
For more information about how C++ source files are parsed, see [Phases of translation](../preprocessor/phases-of-translation.md).
2223

‎docs/cpp/using-declaration.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: "using Declaration"
2+
title: "using declaration"
33
ms.date: "11/04/2016"
4-
helpviewer_keywords: ["using declaration", "declaring namespaces, unqualified names in namespaces", "declarations [C++], using-declaration", "namespaces [C++], unqualified names in", "using keyword [C++]", "declarations [C++], namespaces"]
4+
helpviewer_keywords: ["using declaration", "declarations [C++], using-declaration", "namespaces [C++], unqualified names in", "using keyword [C++]"]
55
ms.assetid: 4184e2b1-3adc-408e-b5f3-0b3f8b554723
66
---
7-
# using Declaration
7+
# using declaration
88

9-
The using declaration introduces a name into the declarative region in which the using declaration appears.
9+
The **using** declaration introduces a name into the declarative region in which the using declaration appears.
1010

1111
## Syntax
1212

‎docs/cpp/welcome-back-to-cpp-modern-cpp.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Whenever possible, use a smart pointer when allocating heap memory. If you must
4141

4242
## std::string and std::string_view
4343

44-
C-style strings are another major source of bugs. By using [std::string and std::wstring](../standard-library/basic-string-class.md) you can eliminate virtually all the errors associated with C-style strings, and gain the benefit of member functions for searching, appending, prepending, and so on. Both are highly optimized for speed. When passing a string to a function that requires only read-only access, in (C++17) you can use [std::string_view](../standard-library/basic-string-view-class.md) for even greater performance benefit.
44+
C-style strings are another major source of bugs. By using [std::string and std::wstring](../standard-library/basic-string-class.md) you can eliminate virtually all the errors associated with C-style strings, and gain the benefit of member functions for searching, appending, prepending, and so on. Both are highly optimized for speed. When passing a string to a function that requires only read-only access, in C++17 you can use [std::string_view](../standard-library/basic-string-view-class.md) for even greater performance benefit.
4545

4646
## std::vector and other Standard Library containers
4747

0 commit comments

Comments
 (0)