From e5844f4f01f2ead43d1f0647ef22c7eee861da17 Mon Sep 17 00:00:00 2001 From: Binh-Minh Ribler Date: Mon, 19 May 2014 14:49:38 -0500 Subject: [svn-r25204] Description: Set OUTPUT_DIRECTORY to cpplus_RM and HTML_OUTPUT to '.' because they were reset by accident causing "bin/release doc" to fail. Ran bin/release to verify the failure was gone. Merged from trunk: r25202 Also, removed from functions' comments some arguments that are only applicable to the trunk. Doxygen gave warnings. Platforms tested: Linux/32 2.6 (jam) - very minor, only comments --- c++/src/H5DataSet.cpp | 2 -- c++/src/H5DataType.cpp | 2 -- c++/src/H5Location.cpp | 2 -- c++/src/cpp_doc_config | 4 ++-- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp index 12ea455..5e4a682 100644 --- a/c++/src/H5DataSet.cpp +++ b/c++/src/H5DataSet.cpp @@ -85,7 +85,6 @@ DataSet::DataSet(const DataSet& original) : AbstractDs(original), H5Object(origi /// object that the dataset is located within. ///\param ref - IN: Reference pointer ///\param ref_type - IN: Reference type - default to H5R_OBJECT -///\param plist - IN: Property list - default to PropList::DEFAULT ///\exception H5::DataSetIException ///\par Description /// \c loc can be DataSet, Group, H5File, or named DataType, that @@ -107,7 +106,6 @@ DataSet::DataSet(const H5Location& loc, const void* ref, H5R_type_t ref_type) : ///\param attr - IN: Specifying location where the referenced object is in ///\param ref - IN: Reference pointer ///\param ref_type - IN: Reference type - default to H5R_OBJECT -///\param plist - IN: Property list - default to PropList::DEFAULT ///\exception H5::ReferenceException // Programmer Binh-Minh Ribler - Oct, 2006 // Modification diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp index 016a3d5..08d1778 100644 --- a/c++/src/H5DataType.cpp +++ b/c++/src/H5DataType.cpp @@ -98,7 +98,6 @@ DataType::DataType( const H5T_class_t type_class, size_t size ) : H5Object() ///\param loc - IN: Location referenced object is in ///\param ref - IN: Reference pointer ///\param ref_type - IN: Reference type - default to H5R_OBJECT -///\param plist - IN: Property list - default to PropList::DEFAULT ///\exception H5::ReferenceException // Programmer Binh-Minh Ribler - Oct, 2006 // Modification @@ -117,7 +116,6 @@ DataType::DataType(const H5Location& loc, const void* ref, H5R_type_t ref_type) ///\param attr - IN: Specifying location where the referenced object is in ///\param ref - IN: Reference pointer ///\param ref_type - IN: Reference type - default to H5R_OBJECT -///\param plist - IN: Property list - default to PropList::DEFAULT ///\exception H5::ReferenceException // Programmer Binh-Minh Ribler - Oct, 2006 // Modification diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp index 42aa99a..80e1462 100644 --- a/c++/src/H5Location.cpp +++ b/c++/src/H5Location.cpp @@ -724,7 +724,6 @@ hid_t H5Location::p_dereference(hid_t loc_id, const void* ref, H5R_type_t ref_ty ///\param loc - IN: Location of the referenced object ///\param ref - IN: Reference pointer ///\param ref_type - IN: Reference type -///\param plist - IN: Property list - default to PropList::DEFAULT ///\exception H5::ReferenceException // Programmer Binh-Minh Ribler - Oct, 2006 // Modification @@ -742,7 +741,6 @@ void H5Location::dereference(const H5Location& loc, const void* ref, H5R_type_t ///\param attr - IN: Attribute specifying the location of the referenced object ///\param ref - IN: Reference pointer ///\param ref_type - IN: Reference type -///\param plist - IN: Property list - default to PropList::DEFAULT ///\exception H5::ReferenceException // Programmer Binh-Minh Ribler - Oct, 2006 // Modification diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index ea10b04..f2caed2 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -58,7 +58,7 @@ PROJECT_LOGO = ./header_files/hdf_logo.jpg # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = HTML +OUTPUT_DIRECTORY = cpplus_RM # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -1069,7 +1069,7 @@ GENERATE_HTML = YES # The default directory is: html. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_OUTPUT = HTML +HTML_OUTPUT = . # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each # generated HTML page (for example: .htm, .php, .asp). -- cgit v0.12