Skip to content

Commit 8589521

Browse files
authored
Merge pull request MicrosoftDocs#1100 from msebolt/consolidation-data
consolidation data
2 parents e552224 + cbffe14 commit 8589521

8 files changed

+708
-794
lines changed

.openpublishing.redirection.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3970,6 +3970,31 @@
39703970
"redirect_url": "/cpp/dotnet/windows-operations-cpp-cli#write_data",
39713971
"redirect_document_id": false
39723972
},
3973+
{
3974+
"source_path": "docs/dotnet/how-to-marshal-ansi-strings-for-adonet-cpp-cli.md",
3975+
"redirect_url": "/cpp/dotnet/data-access-using-adonet-cpp-cli#marshal_ansi",
3976+
"redirect_document_id": false
3977+
},
3978+
{
3979+
"source_path": "docs/dotnet/how-to-marshal-bstr-strings-for-adonet-cpp-cli.md",
3980+
"redirect_url": "/cpp/dotnet/data-access-using-adonet-cpp-cli#marshal_bstr",
3981+
"redirect_document_id": false
3982+
},
3983+
{
3984+
"source_path": "docs/dotnet/how-to-marshal-unicode-strings-for-adonet-cpp-cli.md",
3985+
"redirect_url": "/cpp/dotnet/data-access-using-adonet-cpp-cli#marshal_unicode",
3986+
"redirect_document_id": false
3987+
},
3988+
{
3989+
"source_path": "docs/dotnet/how-to-marshal-a-variant-for-adonet-cpp-cli.md",
3990+
"redirect_url": "/cpp/dotnet/data-access-using-adonet-cpp-cli#marshal_variant",
3991+
"redirect_document_id": false
3992+
},
3993+
{
3994+
"source_path": "docs/dotnet/how-to-marshal-a-safearray-for-adonet-cpp-cli.md",
3995+
"redirect_url": "/cpp/dotnet/data-access-using-adonet-cpp-cli#marshal_safearray",
3996+
"redirect_document_id": false
3997+
},
39733998
{
39743999
"source_path": "docs/error-messages/compiler-errors-1/index.md",
39754000
"redirect_url": "/cpp/error-messages/compiler-errors-1/compiler-fatal-errors-c999-through-c1999",

docs/dotnet/TOC.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,6 @@
113113
## [Graphics Operations (C++/CLI)](graphics-operations-cpp-cli.md)
114114
## [Windows Operations (C++/CLI)](windows-operations-cpp-cli.md)
115115
## [Data Access Using ADO.NET (C++/CLI)](data-access-using-adonet-cpp-cli.md)
116-
### [How to: Marshal ANSI Strings for ADO.NET (C++/CLI)](how-to-marshal-ansi-strings-for-adonet-cpp-cli.md)
117-
### [How to: Marshal BSTR Strings for ADO.NET (C++/CLI)](how-to-marshal-bstr-strings-for-adonet-cpp-cli.md)
118-
### [How to: Marshal Unicode Strings for ADO.NET (C++/CLI)](how-to-marshal-unicode-strings-for-adonet-cpp-cli.md)
119-
### [How to: Marshal a VARIANT for ADO.NET (C++/CLI)](how-to-marshal-a-variant-for-adonet-cpp-cli.md)
120-
### [How to: Marshal a SAFEARRAY for ADO.NET (C++/CLI)](how-to-marshal-a-safearray-for-adonet-cpp-cli.md)
121116
## [Interoperability with Other .NET Languages (C++/CLI)](interoperability-with-other-dotnet-languages-cpp-cli.md)
122117
### [How to: Implement is and as C# Keywords (C++/CLI)](how-to-implement-is-and-as-csharp-keywords-cpp-cli.md)
123118
### [How to: Implement the lock C# Keyword (C++/CLI)](how-to-implement-the-lock-csharp-keyword-cpp-cli.md)

docs/dotnet/data-access-using-adonet-cpp-cli.md

Lines changed: 683 additions & 9 deletions
Large diffs are not rendered by default.

docs/dotnet/how-to-marshal-a-safearray-for-adonet-cpp-cli.md

Lines changed: 0 additions & 173 deletions
This file was deleted.

docs/dotnet/how-to-marshal-a-variant-for-adonet-cpp-cli.md

Lines changed: 0 additions & 161 deletions
This file was deleted.

0 commit comments

Comments
 (0)