Merge pull request #272 from Microsoft/live

ghogen · web-flow · commit d6eb43b2e77b · 2017-05-17T17:44:15.000-07:00
push master to live
diff --git a/docs/build/importing-using-def-files.md b/docs/build/importing-using-def-files.md
@@ -50,7 +50,7 @@ EXPORTS
   
 |Keyword|Emits in the import library|Exports|  
 |-------------|---------------------------------|-------------|  
-|`CONSTANT`|`_imp_ulDataInDll_ulDataInDll`|`_ulDataInDll`|  
+|`CONSTANT`|`_imp_ulDataInDll`, `_ulDataInDll`|`_ulDataInDll`|  
 |`DATA`|`_imp_ulDataInDll`|`_ulDataInDll`|  
   
  Using **__declspec(dllimport)** and CONSTANT lists both the `imp` version and the undecorated name in the .lib DLL import library that is created to allow explicit linking. Using **__declspec(dllimport)** and DATA lists just the `imp` version of the name.  
@@ -82,4 +82,4 @@ if (ulDataInDll == 0L)   /*sample code fragment*/
  The current Visual C++ linker issues a warning if it sees CONSTANT in the .def file to account for this case. The only real reason to use CONSTANT is if you cannot recompile some object file where the header file did not list **__declspec(dllimport)** on the prototype.  
   
 ## See Also  
- [Importing into an Application](../build/importing-into-an-application.md)
+ [Importing into an Application](../build/importing-into-an-application.md)
diff --git a/docs/cpp/errors-and-exception-handling-modern-cpp.md b/docs/cpp/errors-and-exception-handling-modern-cpp.md
@@ -113,10 +113,10 @@ int main()
  For more information about SEH, see [Structured Exception Handling (C/C++)](../cpp/structured-exception-handling-c-cpp.md).  
   
 ## Exception specifications and noexcept  
- Exception specifications were introduced in C++ as a way to specify the exceptions that a function might throw. However, exception specifications proved problematic in practice, and are deprecated in the C++11 draft standard. We recommend that you do not use exception specifications except for `throw()`, which indicates that the exception allows no exceptions to escape. If you must use exception specifications of the type `throw(`*type*`)`, be aware that [!INCLUDE[vcprvc](../build/includes/vcprvc_md.md)] departs from the standard in certain ways. For more information, see [Exception Specifications (throw)](../cpp/exception-specifications-throw-cpp.md). The `noexcept` specifier is introduced in C++11 as the preferred alternative to `throw()`.  
+ Exception specifications were introduced in C++ as a way to specify the exceptions that a function might throw. However, exception specifications proved problematic in practice, and are deprecated in the C++11 draft standard. We recommend that you do not use exception specifications except for `throw()`, which indicates that the function allows no exceptions to escape. If you must use exception specifications of the type `throw(`*type*`)`, be aware that [!INCLUDE[vcprvc](../build/includes/vcprvc_md.md)] departs from the standard in certain ways. For more information, see [Exception Specifications (throw)](../cpp/exception-specifications-throw-cpp.md). The `noexcept` specifier is introduced in C++11 as the preferred alternative to `throw()`.  
   
 ## See Also  
  [How to: Interface Between Exceptional and Non-Exceptional Code](../cpp/how-to-interface-between-exceptional-and-non-exceptional-code.md)   
  [Welcome Back to C++](../cpp/welcome-back-to-cpp-modern-cpp.md)   
  [C++ Language Reference](../cpp/cpp-language-reference.md)   
- [C++ Standard Library](../standard-library/cpp-standard-library-reference.md)
+ [C++ Standard Library](../standard-library/cpp-standard-library-reference.md)
diff --git a/docs/cppcx/threading-and-marshaling-c-cx.md b/docs/cppcx/threading-and-marshaling-c-cx.md
@@ -115,8 +115,8 @@ public ref class MySTAClass
 };  
   
 ```  
-  
- An unsealed class must have marshaling and threading attribute settings so that the compiler can verify that derived classes have the same value for these attributes. If the class doesn't have the settings set explicitly, the compiler generates an error and fails to compile. Any class that's derived from an unsealedclass generates a compiler error in either of these cases:  
+  An unsealed class must have marshaling and threading attribute settings so that the compiler can verify that derived classes have the same value for these attributes. If the class doesn't have the settings set explicitly, the compiler generates an error and fails to compile. Any class that's derived from an unsealed class generates a compiler error in either of these cases:  
+
   
 -   The `ThreadingModel` and `MarshallingBehavior` attributes are not defined in the derived class.  
   
@@ -126,6 +126,4 @@ public ref class MySTAClass
   
 ## See Also  
  [ThreadingModel](http://msdn.microsoft.com/library/windows/apps/xaml/windows.foundation.metadata.threadingmodel.aspx)   
- [MarshallingBehavior](http://msdn.microsoft.com/library/windows/apps/xaml/windows.foundation.metadata.marshalingbehaviorattribute.aspx)
-
-
+ [MarshallingBehavior](http://msdn.microsoft.com/library/windows/apps/xaml/windows.foundation.metadata.marshalingbehaviorattribute.aspx)
diff --git a/docs/cppcx/type-system-c-cx.md b/docs/cppcx/type-system-c-cx.md
@@ -20,15 +20,15 @@ By using the [!INCLUDE[wrt](../cppcx/includes/wrt-md.md)] architecture, you can
   
  For an in-depth discussion of the C++/CX language projection and how it works under the covers, see these blog posts:  
   
-1.  [C++/CX Part 0 of \[n\]: An Introduction](http://blogs.msdn.com/b/vcblog/archive/2012/08/29/cxxcxpart00anintroduction.aspx)  
+1.  [C++/CX Part 0 of \[n\]: An Introduction](https://blogs.msdn.microsoft.com/vcblog/2012/08/29/ccx-part-0-of-n-an-introduction)  
   
-2.  [C++/CX Part 0 of \[n\]: An Introduction](http://blogs.msdn.com/b/vcblog/archive/2012/08/29/cxxcxpart00anintroduction.aspx)  
+2.  [C++/CX Part 1 of \[n\]: A Simple Class](https://blogs.msdn.microsoft.com/vcblog/2012/09/05/ccx-part-1-of-n-a-simple-class)  
   
-3.  [C++/CX Part 2 of \[n\]: Types That Wear Hats](http://blogs.msdn.com/b/vcblog/archive/2012/09/17/cxxcxpart02typesthatwearhats.aspx)  
+3.  [C++/CX Part 2 of \[n\]: Types That Wear Hats](https://blogs.msdn.microsoft.com/vcblog/2012/09/17/ccx-part-2-of-n-types-that-wear-hats)  
   
-4.  [C++/CX Part 3 of \[n\]: Under Construction](http://blogs.msdn.com/b/vcblog/archive/2012/10/05/cxxcxpart03underconstruction.aspx)  
+4.  [C++/CX Part 3 of \[n\]: Under Construction](https://blogs.msdn.microsoft.com/vcblog/2012/10/05/ccx-part-3-of-n-under-construction/)  
   
-5.  [C++/CX Part 4 of \[n\]: Static Member Functions](http://blogs.msdn.com/b/vcblog/archive/2012/10/19/cxxcxpart04staticmemberfunctions.aspx)  
+5.  [C++/CX Part 4 of \[n\]: Static Member Functions](https://blogs.msdn.microsoft.com/vcblog/2012/10/19/ccx-part-4-of-n-static-member-functions)  
   
 ## Windows metadata (.winmd) files  
  When you compile a Universal Windows Platform app that's written in C++, the compiler generates the executable in native machine code, and also generates a separate Windows metadata (.winmd) file that contains descriptions of the public [!INCLUDE[wrt](../cppcx/includes/wrt-md.md)] types, which include classes, structs, enumerations, interfaces, parameterized interfaces, and delegates. The format of the metadata resembles the format that's used in .NET Framework assemblies.  In a C++ component, the .winmd file contains only metadata; the executable code resides in a separate file. This is the case for the [!INCLUDE[wrt](../cppcx/includes/wrt-md.md)] components that are included with Windows. The WinMD file name must match or be a prefix of the root namespace in the source code. (For .NET Framework languages, the .winmd file contains both the code and the metadata, just like a .NET Framework assembly.)  
@@ -162,4 +162,4 @@ By using the [!INCLUDE[wrt](../cppcx/includes/wrt-md.md)] architecture, you can
  For more information, see [Deprecating types and members](../cppcx/deprecating-types-and-members-c-cx.md).  
   
 ## See Also  
- [Visual C++ Language Reference](../cppcx/visual-c-language-reference-c-cx.md)
+ [Visual C++ Language Reference](../cppcx/visual-c-language-reference-c-cx.md)
diff --git a/docs/data/data-access-in-cpp.md b/docs/data/data-access-in-cpp.md
@@ -61,7 +61,7 @@ Connect to Azure SQL Database from C or C++ applications.
 [Azure Storage](/azure/storage/storage-introduction) is a cloud storage solution for modern applications that rely on durability, availability, and scalability to meet the needs of their customers. Connect to Azure Storage from C++ by using the Azure Storage Client Library for C++.
 
 [ODBC Driver 13.1 for SQL Server - Windows Released](https://blogs.msdn.microsoft.com/sqlnativeclient/2016/08/01/announcing-the-odbc-driver-13-1-for-sql-server)
-The latest ODBC driver provides robust data access to Microsoft SQL Server 2016 Microsoft Azure SQL Database for C/C++ based applications. Provides support for features including always encrypted, Azure Active Directory, and AlwaysOn Availability Groupsi. Also available for MacOS and Linux.     
+The latest ODBC driver provides robust data access to Microsoft SQL Server 2016 Microsoft Azure SQL Database for C/C++ based applications. Provides support for features including always encrypted, Azure Active Directory, and AlwaysOn Availability Groups. Also available for MacOS and Linux.     
  
 [SQL Server Native Client](https://msdn.microsoft.com/library/ms130892.aspx)
  SQL Server Native Client is a stand-alone data access application programming interface (API), used for both OLE DB and ODBC, that supports SQL Server 2005 through SQL Server 2014. New applications should use the ODBC Driver 13.1 for SQL Server.
@@ -76,4 +76,4 @@ Azure makes it easy to build C++ applications with increased flexibility, scalab
 The ODBC interface is designed for use with the C programming language. Use of the ODBC interface spans three areas: SQL statements, ODBC function calls, and C programming.
 
 ## See Also
-[Visual C++](../visual-cpp-in-visual-studio.md)
+[Visual C++](../visual-cpp-in-visual-studio.md)
diff --git a/docs/parallel/concrt/codesnippet/CPP/walkthrough-creating-a-dataflow-agent_7.cpp b/docs/parallel/concrt/codesnippet/CPP/walkthrough-creating-a-dataflow-agent_7.cpp
@@ -188,7 +188,7 @@ class dataflow_agent : public agent
             // Set the sentinel event.
             received_sentinel.set();
          },
-         [](int value) { 
+         [](int value) -> bool { 
             return value == 0; 
          });
 
@@ -299,4 +299,4 @@ int wmain()
          << L" negative numbers."<< endl;
    wcout << L"There are " << df_agent.positives() 
          << L" positive numbers."<< endl;
-}
+}
diff --git a/docs/parallel/concrt/task-parallelism-concurrency-runtime.md b/docs/parallel/concrt/task-parallelism-concurrency-runtime.md
@@ -58,7 +58,7 @@ In the Concurrency Runtime, a *task* is a unit of work that performs a specific
   
 -   A task-based continuation is always scheduled for execution when the antecedent task finishes, even when the antecedent task is canceled or throws an exception.  
   
--   Use [concurrency:: HYPERLINK "http://msdn.microsoft.com/library/system.threading.tasks.task.whenall(v=VS.110).aspx" when_all](reference/concurrency-namespace-functions.md#when_all) to create a task that completes after every member of a set of tasks completes. Use [concurrency::when_any](reference/concurrency-namespace-functions.md#when_all) to create a task that completes after one member of a set of tasks completes.  
+-   Use [concurrency::when_all](reference/concurrency-namespace-functions.md#when_all) to create a task that completes after every member of a set of tasks completes. Use [concurrency::when_any](reference/concurrency-namespace-functions.md#when_any) to create a task that completes after one member of a set of tasks completes.  
 
   
 -   Tasks and task groups can participate in the Parallel Patterns Library (PPL) cancellation mechanism. For more information, see [Cancellation in the PPL](cancellation-in-the-ppl.md).  
