summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2018-10-31 21:14:37 (GMT)
committerGitHub <noreply@github.com>2018-10-31 21:14:37 (GMT)
commit5ec8de5c34effdc15916828a05e1f628ab0398db (patch)
tree5888fbddc5c1f1430c773063e0543a0ac13c4e9f
parentf84d7f538cc551d969b23ad591b4fe6c9f311c15 (diff)
parent6c380ba91ae41c6d5c409a5163119318932ae2a3 (diff)
downloadDoxygen-5ec8de5c34effdc15916828a05e1f628ab0398db.zip
Doxygen-5ec8de5c34effdc15916828a05e1f628ab0398db.tar.gz
Doxygen-5ec8de5c34effdc15916828a05e1f628ab0398db.tar.bz2
Merge pull request #6588 from Sleepyowl/master
[C++] Add support for std::shared_ptr
-rw-r--r--src/doxygen.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 59a153f..0f9c941 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -347,6 +347,7 @@ static STLInfo g_stlinfo[] =
{ "auto_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // deprecated
{ "smart_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // C++11
{ "unique_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // C++11
+ { "shared_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // C++14
{ "weak_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // C++11
{ "ios_base", 0, 0, 0, 0, 0, 0, FALSE, FALSE }, // C++11
{ "error_code", 0, 0, 0, 0, 0, 0, FALSE, FALSE }, // C++11
@@ -520,7 +521,7 @@ static void addSTLClasses(EntryNav *rootNav)
{
addSTLMember(classEntryNav,info->templType2,info->templName2);
}
- if (fullName=="std::auto_ptr" || fullName=="std::smart_ptr" ||
+ if (fullName=="std::auto_ptr" || fullName=="std::smart_ptr" || fullName=="std::shared_ptr" ||
fullName=="std::unique_ptr" || fullName=="std::weak_ptr")
{
Entry *memEntry = new Entry;