Skip to content

Commit 052d4cb

Browse files
ghogenghogen
authored
Merge pull request MicrosoftDocs#146 from Microsoft/master
merge to live
2 parents ae23be0 + 8630a5c commit 052d4cb

551 files changed

Lines changed: 53074 additions & 58881 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,5 +1,6 @@
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)
3+
# [C++ conformance improvements in Visual Studio 2017](cpp-conformance-improvements-2017.md)
34
# [Supported Platforms (Visual C++)](supported-platforms-visual-cpp.md)
45
# [C Language](c-language/c-language-reference.md)
56
# [C++ Language](cpp/cpp-language-reference.md)

‎docs/atl-mfc-shared/reference/cfiletime-class.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ static const ULONGLONG Minute = Second* 60;
217217

218218
```
219219
CFileTime operator-(CFileTimeSpan span) const throw();
220-
221220
CFileTimeSpan operator-(CFileTime ft) const throw();
222221
```
223222

‎docs/atl-mfc-shared/reference/cfiletimespan-class.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@ class CFileTimeSpan
9191

9292
```
9393
CFileTimeSpan() throw();
94-
9594
CFileTimeSpan(const CFileTimeSpan& span) throw();
96-
9795
CFileTimeSpan(LONGLONG nSpan) throw();
9896
```
9997

‎docs/atl-mfc-shared/reference/cimage-class.md‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ CDC* pDC = CDC::FromHandle(m_myImage.GetDC());
147147

148148
// Use pDC here
149149
pDC->Rectangle(0, 40, 100, 50);
150-
151150
m_myImage.ReleaseDC();
152151
```
153152
@@ -158,13 +157,13 @@ m_myImage.ReleaseDC();
158157
```cpp
159158
void CMyDlg::OnRButtonDown(UINT nFlags, CPoint point)
160159
{
161-
UNREFERENCED_PARAMETER(nFlags);
160+
UNREFERENCED_PARAMETER(nFlags);
162161
163-
CBitmap* pBitmap = CBitmap::FromHandle(m_myImage);
164-
m_pmenuPop->AppendMenu(0, ID_BMPCOMMAND, pBitmap);
165-
ClientToScreen(&point);
166-
m_pmenuPop->TrackPopupMenu(TPM_RIGHTBUTTON | TPM_LEFTALIGN, point.x,
167-
point.y, this);
162+
CBitmap* pBitmap = CBitmap::FromHandle(m_myImage);
163+
m_pmenuPop->AppendMenu(0, ID_BMPCOMMAND, pBitmap);
164+
ClientToScreen(&point);
165+
m_pmenuPop->TrackPopupMenu(TPM_RIGHTBUTTON | TPM_LEFTALIGN, point.x,
166+
point.y, this);
168167
}
169168
```
170169

@@ -285,7 +284,7 @@ BOOL AlphaBlend(
285284
Attaches `hBitmap` to a `CImage` object.
286285

287286
```
288-
void Attach(HBITMAP hBitmap, DIBOrientation eOrientation = DIBOR_DEFAULT) throw();
287+
void Attach(HBITMAP hBitmap, DIBOrientation eOrientation = DIBOR_DEFAULT) throw();
289288
```
290289

291290
### Parameters

‎docs/atl-mfc-shared/reference/coledatetime-class.md‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,10 @@ class COleDateTime
142142

143143
```
144144
bool operator==(const COleDateTime& date) const throw();
145-
146145
bool operator!=(const COleDateTime& date) const throw();
147-
148146
bool operator<(const COleDateTime& date) const throw();
149-
150147
bool operator>(const COleDateTime& date) const throw();
151-
152148
bool operator<=(const COleDateTime& date) const throw();
153-
154149
bool operator>=(const COleDateTime& date) const throw();
155150
```
156151

@@ -176,28 +171,22 @@ bool operator>=(const COleDateTime& date) const throw();
176171

177172
```
178173
COleDateTime() throw();
179-
180174
COleDateTime(const VARIANT& varSrc) throw();
181-
182175
COleDateTime(DATE dtSrc) throw();
183-
184176
COleDateTime(time_t timeSrc) throw();
185-
186177
COleDateTime(__time64_t timeSrc) throw();
187-
188178
COleDateTime(const SYSTEMTIME& systimeSrc) throw();
189-
190179
COleDateTime(const FILETIME& filetimeSrc) throw();
191180
192-
COleDateTime(
193-
int nYear,
194-
int nMonth,
195-
int nDay,
196-
int nHour,
197-
int nMin,
198-
int nSec) throw();
181+
COleDateTime(int nYear,
182+
int nMonth,
183+
int nDay,
184+
int nHour,
185+
int nMin,
186+
int nSec) throw();
199187
200-
COleDateTime(WORD wDosDate, WORD wDosTime) throw();
188+
COleDateTime(WORD wDosDate,
189+
WORD wDosTime) throw();
201190
COleDateTime(const DBTIMESTAMP& dbts) throw();
202191
```
203192

@@ -758,17 +747,11 @@ DateTimeStatus m_status;
758747

759748
```
760749
COleDateTime& operator=(const VARIANT& varSrc) throw();
761-
762750
COleDateTime& operator=(DATE dtSrc) throw();
763-
764751
COleDateTime& operator=(const time_t& timeSrc) throw();
765-
766752
COleDateTime& operator=(const __time64_t& timeSrc) throw();
767-
768753
COleDateTime& operator=(const SYSTEMTIME& systimeSrc) throw();
769-
770754
COleDateTime& operator=(const FILETIME& filetimeSrc) throw();
771-
772755
COleDateTime& operator=(const UDATE& udate) throw();
773756
```
774757

@@ -802,9 +785,7 @@ COleDateTime& operator=(const UDATE& udate) throw();
802785

803786
```
804787
COleDateTime operator+(COleDateTimeSpan dateSpan) const throw();
805-
806788
COleDateTime operator-(COleDateTimeSpan dateSpan) const throw();
807-
808789
COleDateTimeSpan operator-(const COleDateTime& date) const throw();
809790
```
810791

@@ -831,7 +812,6 @@ COleDateTimeSpan operator-(const COleDateTime& date) const throw();
831812

832813
```
833814
COleDateTime& operator+=(COleDateTimeSpan dateSpan) throw();
834-
835815
COleDateTime& operator-=(COleDateTimeSpan dateSpan) throw();
836816
```
837817

@@ -852,7 +832,7 @@ COleDateTime& operator-=(COleDateTimeSpan dateSpan) throw();
852832
Converts a **ColeDateTime** value into a **DATE**.
853833

854834
```
855-
operator DATE() const throw();
835+
operator DATE() const throw();
856836
```
857837

858838
### Remarks

‎docs/atl-mfc-shared/reference/coledatetimespan-class.md‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,10 @@ class COleDateTimeSpan
109109

110110
```
111111
bool operator==(const COleDateTimeSpan& dateSpan) const throw();
112-
113112
bool operator!=(const COleDateTimeSpan& dateSpan) const throw();
114-
115113
bool operator<(const COleDateTimeSpan& dateSpan) const throw();
116-
117114
bool operator>(const COleDateTimeSpan& dateSpan) const throw();
118-
119115
bool operator<=(const COleDateTimeSpan& dateSpan) const throw();
120-
121116
bool operator>=(const COleDateTimeSpan& dateSpan) const throw();
122117
```
123118

@@ -603,7 +598,6 @@ COleDateTimeSpan operator-() const throw();
603598

604599
```
605600
COleDateTimeSpan& operator+=(const COleDateTimeSpan dateSpan) throw();
606-
607601
COleDateTimeSpan& operator-=(const COleDateTimeSpan dateSpan) throw();
608602
```
609603

@@ -621,7 +615,7 @@ COleDateTimeSpan& operator-=(const COleDateTimeSpan dateSpan) throw();
621615
Converts this `COleDateTimeSpan` value to a **double**.
622616

623617
```
624-
operator double() const throw();
618+
operator double() const throw();
625619
```
626620

627621
### Remarks

0 commit comments

Comments
 (0)