Change #include style
Header files are now always included with their path from the
project's root directory rather than the path relative to
the includer.
Change-Id: If39b8510eef8da00baf5fe88337c45dbdf8c766e
Refs: #3084
diff --git a/docs/code-style.rst b/docs/code-style.rst
index 7071e1d..48984bb 100644
--- a/docs/code-style.rst
+++ b/docs/code-style.rst
@@ -432,7 +432,6 @@
my-class.hpp, my-class.cpp
-
2.2. Names representing types must be written in English in mixed case starting with upper case.
.. code-block:: c++
@@ -544,7 +543,6 @@
static std::string s_name;
};
-
2.11. Variables with a large scope should have long (explicit) names, variables with a small
scope can have short names.
@@ -612,7 +610,6 @@
The notation is taken from mathematics where it is an established convention for
indicating a number of objects.
-
2.18. The suffix ``Num`` or ``No`` should be used for variables representing an entity number.
.. code-block:: c++
@@ -701,7 +698,6 @@
hierarchy, then child classes should should define their own ``Error`` or
``Exception`` classes that are inherited from the parent's Error class.
-
2.25. Functions (methods returning something) should be named after what they return and
procedures (void methods) after what they do.
@@ -717,8 +713,8 @@
3.2. Header files must contain an include guard.
- For example, header file located in ``module/class-name.hpp`` or in
- ``src/module/class-name.hpp`` should have header guard in the following form:
+ For example, a header file named ``module/class-name.hpp`` or
+ ``src/module/class-name.hpp`` should have a header guard in the following form:
.. code-block:: c++
@@ -727,39 +723,43 @@
...
#endif // APP_MODULE_CLASS_NAME_HPP
- The name should follow the location of the file inside the source tree and prevents
- naming conflicts. Header guard should be prefixed with the application/library name
- to avoid conflicts with other packaged and libraries.
+ The macro name should reflect the path of the header file relative to the root of the
+ source tree, in order to prevent naming conflicts. The header guard should be prefixed
+ with the application/library name to avoid conflicts with other packages and libraries.
-3.3. Header files which are in the same source distribution should be included in
-``"quotes"``, if possible with a path relative to the source file. Header files for
-system and other external libraries should be included in ``<angle brackets>``.
+3.3. Include directives for system headers and other external libraries should use
+``<angle brackets>``. Header files in the same source code repository should be included
+using ``"quotes"``.
.. code-block:: c++
+ #include "ndn-cxx/util/random.hpp"
+
#include <string>
#include <boost/lexical_cast.hpp>
- #include "util/random.hpp"
+ All of a project's header files should be included with their path relative to
+ the project's source directory. The use of UNIX directory shortcuts ``.``
+ (the current directory) and ``..`` (the parent directory) is discouraged.
3.4. Include statements should be grouped. Same-project headers should be included first.
Leave an empty line between groups of include statements. Sort alphabetically within a group.
+For example, the include section of ``ndn-cxx/foo/bar.cpp`` may look like this:
.. code-block:: c++
- #include "detail/pending-interest.hpp"
- #include "util/random.hpp"
+ #include "ndn-cxx/detail/pending-interest.hpp"
+ #include "ndn-cxx/util/random.hpp"
+ #include <cstdlib>
#include <fstream>
#include <iomanip>
#include <boost/lexical_cast.hpp>
#include <boost/regex.hpp>
-
3.5. Types that are local to one file only can be declared inside that file.
-
3.6. Implicit conversion is generally allowed.
Implicit conversion between integer and floating point numbers can cause problems and
@@ -773,7 +773,6 @@
``const_cast`` instead where appropriate. Use ``static_pointer_cast``,
``dynamic_pointer_cast``, ``const_pointer_cast`` when dealing with ``shared_ptr``.
-
3.7. Variables should be initialized where they are declared.
This ensures that variables are valid at any time. Sometimes it is impossible to
@@ -801,7 +800,6 @@
* When the class is used only inside the compilation unit, e.g., when implementing pImpl
idiom (aka Bridge pattern) or similar cases.
-
3.9. C++ pointers and references should have their reference symbol next to the type rather
than to the name.
diff --git a/docs/doxygen.conf.in b/docs/doxygen.conf.in
index 8cb8bcb..e353524 100644
--- a/docs/doxygen.conf.in
+++ b/docs/doxygen.conf.in
@@ -2031,7 +2031,7 @@
# preprocessor.
# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-INCLUDE_PATH =
+INCLUDE_PATH = ..
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
# patterns (like *.h and *.hpp) to filter out the header-files in the