Merge 479527b into cd260c9

.gitignore

@@ -29,15 +29,14 @@
 /userdoc.*
 
 # test and temp files
-test*
-!test.cxx
 *.pyc
 *.swp
 *.swo
 /log
 /ld
 
 # Executable
+argstest
 /build/
 CMakeCache.txt
 CMakeFiles

.travis.yml

@@ -145,6 +145,6 @@ before_install:
   - pip install --user cpp-coveralls
 
 after_success:
-  - if [ "${COVERAGE}" = 1 ]; then coveralls --root .. -E ".*catch.*" -E ".*CMakeFiles.*" -E ".*gitlike.cxx.*" -E ".*test.cxx.*"; fi
+  - if [ "${COVERAGE}" = 1 ]; then coveralls --root .. -E ".*catch.*" -E ".*CMakeFiles.*" -E ".*gitlike.cxx.*" -E ".*test.*"; fi
 
 

CMakeLists.txt

@@ -35,5 +35,10 @@ else ()
     target_compile_options(argstest PRIVATE -Wall -Wextra -Werror -pedantic -Wshadow -Wunused-parameter)
 endif ()
 
+add_executable(argstest-multiple-inclusion test/multiple_inclusion_1.cxx test/multiple_inclusion_2.cxx)
+target_link_libraries(argstest-multiple-inclusion args)
+set_property(TARGET argstest-multiple-inclusion PROPERTY CXX_STANDARD 11)
+
 enable_testing()
 add_test(NAME "test" COMMAND argstest)
+add_test(NAME "test-multiple-inclusion" COMMAND argstest-multiple-inclusion)

Makefile

@@ -17,7 +17,7 @@ LDFLAGS		+=	$(FLAGS)
 SOURCES		= 	test.cxx
 OBJECTS		= 	$(SOURCES:.cxx=.o)
 DEPENDENCIES=	$(SOURCES:.cxx=.d)
-EXECUTABLE	=	test
+EXECUTABLE	=	argstest
 
 .PHONY: all clean pages runtests uninstall install installman
 

args.hxx

@@ -2545,18 +2545,18 @@ namespace args
             }
     };
 
-    Command::RaiiSubparser::RaiiSubparser(ArgumentParser &parser_, std::vector<std::string> args_)
+    inline Command::RaiiSubparser::RaiiSubparser(ArgumentParser &parser_, std::vector<std::string> args_)
         : command(parser_.SelectedCommand()), parser(std::move(args_), parser_, command, parser_.helpParams), oldSubparser(command.subparser)
     {
         command.subparser = &parser;
     }
 
-    Command::RaiiSubparser::RaiiSubparser(const Command &command_, const HelpParams &params_): command(command_), parser(command, params_), oldSubparser(command.subparser)
+    inline Command::RaiiSubparser::RaiiSubparser(const Command &command_, const HelpParams &params_): command(command_), parser(command, params_), oldSubparser(command.subparser)
     {
         command.subparser = &parser;
     }
 
-    void Subparser::Parse()
+    inline void Subparser::Parse()
     {
         isParsed = true;
         Reset();

test/multiple_inclusion_1.cxx

@@ -0,0 +1,6 @@
+#include <args.hxx>
+
+int foo() { return 42; }
+int bar();
+
+int main() { return foo() - bar(); }

test/multiple_inclusion_2.cxx

@@ -0,0 +1,3 @@
+#include <args.hxx>
+
+int bar() { return 42; }