Merge branch 'master' of github.com:philsquared/Catch into develop

# By Andy Balaam
# Via Phil Nash (2) and Andy Balaam (1)
* 'master' of github.com:philsquared/Catch:
  Fix a typo (missing "n")

Conflicts:
	README.md
	include/internal/catch_version.hpp
	single_include/catch.hpp
This commit is contained in:
Phil Nash 2014-08-22 19:36:53 +01:00
commit 341a9c4443

View File

@ -9,7 +9,7 @@ Exactly one source file must ```#define``` either ```CATCH_CONFIG_MAIN``` or ```
## Long answer ## Long answer
Usually C++ code is split between a header file, containing declarations and prototypes, and an implementation file (.cpp) containig the definition, or implementation, code. Each implementation file, along with all the headers that it includes (and which those headers include, etc), is expanded into a single entity called a translation unit - which is then passed to the compiler and compiled down to an object file. Usually C++ code is split between a header file, containing declarations and prototypes, and an implementation file (.cpp) containing the definition, or implementation, code. Each implementation file, along with all the headers that it includes (and which those headers include, etc), is expanded into a single entity called a translation unit - which is then passed to the compiler and compiled down to an object file.
But functions and methods can also be written inline in header files. The downside to this is that these definitions will then be compiled in *every* translation unit that includes the header. But functions and methods can also be written inline in header files. The downside to this is that these definitions will then be compiled in *every* translation unit that includes the header.