diff --git a/.circleci/config.yml b/.circleci/config.yml index 2932703..be97019 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: itk-v4.8.0_use_system_libraries-off: <<: *build-settings docker: - - image: slicer/slicerexecutionmodel:${CIRCLE_JOB} + - image: hjmjohnson/slicerexecutionmodel:${CIRCLE_JOB} steps: - checkout - run: @@ -16,7 +16,7 @@ jobs: itk-v4.10.1_use_system_libraries-off: <<: *build-settings docker: - - image: slicer/slicerexecutionmodel:${CIRCLE_JOB} + - image: hjmjohnson/slicerexecutionmodel:${CIRCLE_JOB} steps: - checkout - run: @@ -28,7 +28,7 @@ jobs: itk-v4.13.0_use_system_libraries-off: <<: *build-settings docker: - - image: slicer/slicerexecutionmodel:${CIRCLE_JOB} + - image: hjmjohnson/slicerexecutionmodel:${CIRCLE_JOB} steps: - checkout - run: @@ -41,7 +41,7 @@ jobs: itk-master_use_system_libraries-off: <<: *build-settings docker: - - image: slicer/slicerexecutionmodel:${CIRCLE_JOB} + - image: hjmjohnson/slicerexecutionmodel:${CIRCLE_JOB} steps: - checkout - run: diff --git a/tclap/CMakeLists.txt b/tclap/CMakeLists.txt index 885dbdd..4375898 100644 --- a/tclap/CMakeLists.txt +++ b/tclap/CMakeLists.txt @@ -1,4 +1,6 @@ -project(TCLAP LANGUAGES CXX) + +project(TCLAP VERSION 1.2.2 +LANGUAGES CXX) # -------------------------------------------------------------------------- # Install headers diff --git a/tclap/docs/Makefile.am b/tclap/docs/Makefile.am index 6cb7c3a..f9a0528 100644 --- a/tclap/docs/Makefile.am +++ b/tclap/docs/Makefile.am @@ -4,6 +4,9 @@ if DOC all: @DOXYGEN@ Doxyfile +manual: manual.xml + xsltproc -o manual.html --stringparam html.stylesheet style.css /usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl manual.xml + else all: diff --git a/tclap/docs/README b/tclap/docs/README index 8e99542..96d8d40 100644 --- a/tclap/docs/README +++ b/tclap/docs/README @@ -2,4 +2,4 @@ To generate the manual from the docbook xml you need and xslt processor and an xsl file that defines the output. For example: -xsltproc --stringparam html.stylesheet style.css /Users/mes/software/docbook-xsl-1.71.1/xhtml/docbook.xsl manual.xml > manual.html +xsltproc --stringparam html.stylesheet style.css /usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl manual.xml > manual.html diff --git a/tclap/docs/index.html b/tclap/docs/index.html index 4546ff0..11b15fb 100644 --- a/tclap/docs/index.html +++ b/tclap/docs/index.html @@ -45,7 +45,7 @@

Links

  • Read the API documentation

  • Visit the SourceForge project page

    • -
  • Send feedback, comments, patches, etc.

    • +
  • Send feedback, comments, patches, etc.

    • diff --git a/tclap/docs/manual.html b/tclap/docs/manual.html index dd75d66..51d4392 100644 --- a/tclap/docs/manual.html +++ b/tclap/docs/manual.html @@ -1,7 +1,5 @@ - - -Templatized C++ Command Line Parser Manual

    Templatized C++ Command Line Parser Manual

    Michael E Smoot

    Copyright © 2003,2004,2005,2006,2009,2011,2012 Michael E. Smoot

    Table of Contents

    1. Basic Usage
    Overview
    Example
    Library Properties
    Common Argument Properties
    Compiling
    2. Fundamental Classes
    CmdLine
    SwitchArg
    ValueArg
    MultiArg
    MultiSwitchArg
    UnlabeledValueArg
    UnlabeledMultiArg
    3. Complications
    I want to combine multiple switches into one argument...
    I want one argument or the other, but not both...
    I have more arguments than single flags make sense for...
    I want to constrain the values allowed for a particular -argument...
    I want the Args to add themselves to the CmdLine...
    I want different output than what is provided...
    I don't want the --help and --version switches to be created automatically...
    I want to ignore certain arguments...
    I want to ignore unmatched arguments...
    I want to read hex integers as arguments...
    I want to use different types...
    I want to use Windows-style flags like "/x" and "/y"...
    4. Notes
    Type Descriptions
    Visitors
    More Information

    Chapter 1. Basic Usage

    Table of Contents

    Overview
    Example
    Library Properties
    Common Argument Properties
    Compiling

    Overview

    +Templatized C++ Command Line Parser Manual

    Templatized C++ Command Line Parser Manual

    Michael E Smoot

    Copyright © 2003,2004,2005,2006,2009,2011,2012 Michael E. Smoot

    Table of Contents

    1. Basic Usage
    Overview
    Example
    Library Properties
    Common Argument Properties
    Compiling
    2. Fundamental Classes
    CmdLine
    SwitchArg
    ValueArg
    MultiArg
    MultiSwitchArg
    UnlabeledValueArg
    UnlabeledMultiArg
    3. Complications
    I want to combine multiple switches into one argument...
    I want one argument or the other, but not both...
    I have more arguments than single flags make sense for...
    I want to constrain the values allowed for a particular +argument...
    I want the Args to add themselves to the CmdLine...
    I want different output than what is provided...
    I don't want the --help and --version switches to be created automatically...
    I want to ignore certain arguments...
    I want to ignore unmatched arguments...
    I want to read hex integers as arguments...
    I want to use different types...
    I want to use Windows-style flags like "/x" and "/y"...
    4. Notes
    Type Descriptions
    Visitors
    More Information

    Chapter 1. Basic Usage

    Table of Contents

    Overview
    Example
    Library Properties
    Common Argument Properties
    Compiling

    Overview

    TCLAP has a few key classes to be aware of. The first is the CmdLine (command line) class. This class parses @@ -14,15 +12,15 @@ MultiArg and UnlabeledMultiArg. These classes are templatized, which means they can be defined to parse -a value of any type. Once you add the +a value of any type. Once you add the arguments to the CmdLine object, it parses the command line and assigns the data it finds to the specific argument objects it contains. Your program accesses the values parsed by calls to the getValue() methods of the argument objects. -

    Example

    -Here is a simple example ... +

    Example

    +Here is a simple example ... 

     #include <string>
@@ -137,11 +135,11 @@
    Command description message

    -

    Library Properties

    +

    Library Properties

    This example shows a number of different properties of the library... -

    • Arguments can appear in any order (...mostly, - more on this later).
    • The help, version +

      • Arguments can appear in any order (...mostly, + more on this later).
      • The help, version and --SwitchArgs are specified automatically. Using either the -h or --help flag will cause the USAGE message to be displayed, @@ -150,31 +148,31 @@ be displayed, and -- or --ignore_rest will cause the remaining labeled arguments to be ignored. These switches are -included by default on every command line. You can disable this functionality if desired (although we don't recommend it). +included by default on every command line. You can disable this functionality if desired (although we don't recommend it). How we generate the behavior behind these flags is described - later. -
      • If there is an error parsing the command line (e.g. a required + later. +
      • If there is an error parsing the command line (e.g. a required argument isn't provided), the program exits and displays a brief -USAGE and an error message.
      • The program name is assumed to always be argv[0], so it isn't -specified directly.
      • A value delimiter character can be specified. This means that if you +USAGE and an error message.
      • The program name is assumed to always be argv[0], so it isn't +specified directly.
      • A value delimiter character can be specified. This means that if you prefer arguments of the style -s=asdf instead of --s asdf, you can do so.
      • Always wrap everything in a try block that catches +-s asdf, you can do so.
      • Always wrap everything in a try block that catches ArgExceptions! Any problems found in constructing the CmdLine, constructing the Args, or parsing the command line will throw an ArgException.

      -

    Common Argument Properties

    +

    Common Argument Properties

    Arguments, whatever their type, have a few common properties. These properties are set in the constructors of the arguments. -

    • First is the flag or the character preceded by a dash(-) that -signals the beginning of the argument on the command line.
    • Arguments also have names, which can also be used +

      • First is the flag or the character preceded by a dash(-) that +signals the beginning of the argument on the command line.
      • Arguments also have names, which can also be used as an alternative flag on the command line, this time preceded by two dashes -(--) [like the familiar getopt_long()].
      • Next is the description of the argument. This is a short +(--) [like the familiar getopt_long()].
      • Next is the description of the argument. This is a short description of the argument displayed in the help/usage message -when needed.
      • The following parameters in the constructors vary depending on +when needed.
      • The following parameters in the constructors vary depending on the type of argument. Some possible values include: -
        • A boolean value indicating whether the Arg is required or not.
        • A default value.
        • A description of the type of value expected.
        • A constraint on the value expected.
        • The CmdLine instance that the Arg should be added to.
        • A Visitor.
      • See the API Documentation for more detail.

      -

    Compiling

    +

    • A boolean value indicating whether the Arg is required or not.
    • A default value.
    • A description of the type of value expected.
    • A constraint on the value expected.
    • The CmdLine instance that the Arg should be added to.
    • A Visitor.
  • See the API Documentation for more detail.

    • +

    Compiling

    TCLAP is implemented entirely in header files which means you only need to include CmdLine.h to use the library. 

    @@ -204,7 +202,7 @@
 effort to keep the library compliant with the ANSI C++ standard so
 if your compiler meets the standard, then this library should work
 for you. Please let us know if this is not the case! 
-
    Windows Note
    
+
    Windows Note
    
 As we understand things, Visual C++ does not have the file 
 config.h which is used to make platform
 specific definitions.  In this situation, we assume that you
@@ -217,7 +215,7 @@
 should work.  We think.  Alternatively, just edit
 the files ValueArg.h and MultiArg.h.
 
    
-
    Random Note
    
+
    Random Note
    
 If your compiler doesn't support the using syntax used
 in UnlabeledValueArg and 
 UnlabeledMultiArg to support two stage name lookup, 
@@ -228,26 +226,26 @@
 of just _ignorable (do this for each variable 
 or method referenced by using).
 
    
-
    Chapter 2. Fundamental Classes
    Table of Contents
    CmdLine
    SwitchArg
    ValueArg
    MultiArg
    MultiSwitchArg
    UnlabeledValueArg
    UnlabeledMultiArg
    CmdLine
    
+
    Chapter 2. Fundamental Classes
    Table of Contents
    CmdLine
    SwitchArg
    ValueArg
    MultiArg
    MultiSwitchArg
    UnlabeledValueArg
    UnlabeledMultiArg
    CmdLine
    
 The CmdLine class contains the arguments that define
 the command line and manages the parsing of the command line. The 
 CmdLine doesn't parse the command line itself it only
 manages the parsing. The actual parsing of individual arguments occurs within
 the arguments themselves. The CmdLine keeps track of
-of the required arguments, relationships 
-between arguments, and output generation.
-
    SwitchArg
    SwitchArgs are what the name implies: 
+of the required arguments, relationships 
+between arguments, and output generation.
+
    SwitchArg
    SwitchArgs are what the name implies: 
 simple, on/off, boolean switches. Use SwitchArgs 
 anytime you want to turn
 some sort of system property on or off. SwitchArgs 
 don't parse a value. They return TRUE or 
 FALSE, depending on whether the switch has been found 
-on the command line and what the default value was defined as.
    ValueArg
    ValueArgs are arguments that read a 
+on the command line and what the default value was defined as.
    ValueArg
    ValueArgs are arguments that read a 
 value of some type
 from the command line. Any time you need a file name, a number,
 etc. use a ValueArg or one of its variants. 
 All ValueArgs are 
- templatized and will attempt to parse
+ templatized and will attempt to parse
 the string its flag matches on the command line as the type it is
 specified as. ValueArg<int> 
 will attempt to parse an
@@ -256,7 +254,7 @@
 for the specified type doesn't
 recognize the string on the command line as its defined type, then
 an exception will be thrown.
-
    MultiArg
    
+
    MultiArg
    
 A MultiArg is a ValueArg that
 can be specified more than once on a command line and instead of returning
 a single value, returns a vector of values.
@@ -285,8 +283,8 @@

    Note that MultiArgs can be added to the CmdLine in any order (unlike - UnlabeledMultiArg). -

    MultiSwitchArg

    + UnlabeledMultiArg). +

    MultiSwitchArg

    A MultiSwitchArg is a SwitchArg that can be specified more than once on a command line. This can be useful @@ -307,7 +305,7 @@ MultiSwitchArg quiet("q","quiet","Reduce the volume of output",5); cmd.add( quiet );

    -

    UnlabeledValueArg

    +

    UnlabeledValueArg

    An UnlabeledValueArg is a ValueArg that is not identified by a flag on the command line. Instead UnlabeledValueArgs are identified by their position in the argv array. @@ -316,7 +314,7 @@ identifying them on the command line, but there are some situations where flags are burdensome and not worth the effort. One example might be if you want to implement a magical command we'll -call copy. All copy does is +call copy. All copy does is copy the file specified in the first argument to the file specified in the second argument. We can do this using UnlabeledValueArgs which are pretty @@ -327,7 +325,7 @@ 

     
-                UnlabeledValueArg<float>  nolabel( "name", "unlabeled test", 3.14,
+                UnlabeledValueArg<float>  nolabel( "name", "unlabeled test", true, 3.14,
                                                   "nameString"  );
                 cmd.add( nolabel );
 
@@ -348,7 +346,7 @@
 or in the declaration), but the UnlabeledValueArgs 
 will still be parsed in the order they are added. Just remember that order is
 important for unlabeled arguments. 
-

    UnlabeledMultiArg

    +

    UnlabeledMultiArg

    An UnlabeledMultiArg is an UnlabeledValueArg that allows more than one value to be specified. Only one UnlabeledMultiArg can be specified per command line. The UnlabeledMultiArg simply reads the remaining @@ -356,7 +354,7 @@

    Say you want a strange command that searches each file specified for a given string (let's call it -grep), but you don't want to have to type in all of the file +grep), but you don't want to have to type in all of the file names or write a script to do it for you. Say, 

    @@ -364,7 +362,7 @@

    First remember that the * is handled by the shell and -expanded accordingly, so what the program grep sees is +expanded accordingly, so what the program grep sees is really something like: 

    @@ -413,11 +411,11 @@
 then just declare the UnlabeledMultiArg as type
 string and parse the different values yourself or use
 several UnlabeledValueArgs. 
-

    Chapter 3. Complications

    Table of Contents

    I want to combine multiple switches into one argument...
    I want one argument or the other, but not both...
    I have more arguments than single flags make sense for...
    I want to constrain the values allowed for a particular +

    Chapter 3. Complications

    Table of Contents

    I want to combine multiple switches into one argument...
    I want one argument or the other, but not both...
    I have more arguments than single flags make sense for...
    I want to constrain the values allowed for a particular argument...
    I want the Args to add themselves to the CmdLine...
    I want different output than what is provided...
    I don't want the --help and --version switches to be created automatically...
    I want to ignore certain arguments...
    I want to ignore unmatched arguments...
    I want to read hex integers as arguments...
    I want to use different types...
    I want to use Windows-style flags like "/x" and "/y"...

    Naturally, what we have seen to this point doesn't satisfy all of our needs. -

    I want to combine multiple switches into one argument...

    +

    I want to combine multiple switches into one argument...

    Multiple SwitchArgs can be combined into a single argument on the command line. If you have switches -a, -b and -c it is valid to do either: @@ -440,7 +438,7 @@ This is to make this library more in line with the POSIX and GNU standards (as I understand them). -

    I want one argument or the other, but not both...

    +

    I want one argument or the other, but not both...

    Suppose you have a command that must read input from one of two possible locations, either a local file or a URL. The command must read something, so one @@ -518,7 +516,7 @@

    -

    I have more arguments than single flags make sense for...

    +

    I have more arguments than single flags make sense for...

    Some commands have so many options that single flags no longer map sensibly to the available options. In this case, it is desirable to specify Args using only long options. This one is easy to @@ -534,7 +532,7 @@ SwitchArg caseSwitch("","upperCase","Print in upper case",false);

    -

    I want to constrain the values allowed for a particular +

    I want to constrain the values allowed for a particular argument...

    Interface Change!!! Sorry folks, but we've changed the interface since version 1.0.X for constraining Args. @@ -587,7 +585,7 @@ checks whether the value parsed is greater than 0 (done in the check() method) and create your Arg with your new Constraint. -

    I want the Args to add themselves to the CmdLine...

    +

    I want the Args to add themselves to the CmdLine...

    New constructors have been added for each Arg that take a CmdLine object as an argument. Each Arg then @@ -618,7 +616,7 @@ cmd.parse(argc,argv);

    -

    I want different output than what is provided...

    +

    I want different output than what is provided...

    It is straightforward to change the output generated by TCLAP. Either subclass the StdOutput class and re-implement the methods you choose, @@ -671,7 +669,7 @@ yourself. Also note that the failure method is now responsible for exiting the application (assuming that is the desired behavior). -

    I don't want the --help and --version switches to be created automatically...

    +

    I don't want the --help and --version switches to be created automatically...

    Help and version information is useful for nearly all command line applications and as such we generate flags that provide those options automatically. However, there are situations when these flags are undesirable. For these @@ -681,7 +679,7 @@ 

     		CmdLine cmd("this is a message", ' ', "0.99", false );

    -

    I want to ignore certain arguments...

    +

    I want to ignore certain arguments...

    The -- flag is automatically included in the CmdLine. As (almost) per POSIX and GNU standards, any argument specified @@ -702,8 +700,8 @@ ignore arguments after the --. To accommodate this, we can make both UnlabeledValueArgs and UnlabeledMultiArgs ignoreable in their constructors. -See the API Documentation for details. -

    I want to ignore unmatched arguments...

    +See the API Documentation for details. +

    I want to ignore unmatched arguments...

    By default, if TCLAP sees an argument that doesn't match a specified Arg, it will produce an exception. This strict handling provides some assurance that all input to a program @@ -754,7 +752,7 @@ is set to true and an UnlabeledMultiArg is added to the command line, then the UnlabeledMultiArg will "win" and all extra arguments will be added to it rather than be ignored. -

    I want to read hex integers as arguments...

    +

    I want to read hex integers as arguments...

    Sometimes it's desirable to read integers formatted in decimal, hexadecimal, and octal format. This is now possible by #defining the TCLAP_SETBASE_ZERO directive. Simply define this directive in your code and integer arguments will be parsed @@ -800,7 +798,7 @@ setbase() is meant to be used. So while we're making this functionality available, we're not turning it on by default for fear of bad things happening in different compilers. If you know otherwise, please let us know. -

    I want to use different types...

    +

    I want to use different types...

    The usual C++ types (int, long, bool, etc.) are supported by TCLAP out of the box. As long as operator>> and operator<< are supported, other types should work fine @@ -826,7 +824,7 @@ For complete examples see the files test11.cpp and test12.cpp in the examples directory. -

    I want to use Windows-style flags like "/x" and "/y"...

    +

    I want to use Windows-style flags like "/x" and "/y"...

    It is traditional in Posix environments that the "-" and "--" strings are used to signify the beginning of argument flags and long argument names. However, other environments, namely Windows, use different strings. TCLAP allows you to @@ -857,14 +855,14 @@

    -

    Chapter 4. Notes

    Table of Contents

    Type Descriptions
    Visitors
    More Information

    +

    Chapter 4. Notes

    Table of Contents

    Type Descriptions
    Visitors
    More Information

    Like all good rules, there are many exceptions.... -

    Type Descriptions

    +

    Type Descriptions

    Ideally this library would use RTTI to return a human readable name of the type declared for a particular argument. Unfortunately, at -least for g++, the names returned aren't +least for g++, the names returned aren't particularly useful. -

    Visitors

    +

    Visitors

    Disclaimer: Almost no one will have any use for Visitors, they were added to provide special handling for default arguments. Nothing @@ -933,8 +931,8 @@ the program will print the author name, Homer J. Simpson and exit without processing any further (as specified in the visit() method). -

    More Information

    -For more information, look at the +

    More Information

    +For more information, look at the API Documentation and the examples included with the distribution.

    diff --git a/tclap/docs/manual.xml b/tclap/docs/manual.xml index 3a25878..f9d1caf 100644 --- a/tclap/docs/manual.xml +++ b/tclap/docs/manual.xml @@ -461,7 +461,7 @@ The code would look like this: - UnlabeledValueArg<float> nolabel( "name", "unlabeled test", 3.14, + UnlabeledValueArg<float> nolabel( "name", "unlabeled test", true, 3.14, "nameString" ); cmd.add( nolabel ); diff --git a/tclap/examples/Makefile.am b/tclap/examples/Makefile.am index cad4369..8c06efb 100644 --- a/tclap/examples/Makefile.am +++ b/tclap/examples/Makefile.am @@ -20,7 +20,7 @@ test13_SOURCES = test13.cpp test14_SOURCES = test14.cpp test15_SOURCES = test15.cpp test16_SOURCES = test16.cpp -test17_SOURCES = test17.cpp test17-a.cpp +test17_SOURCES = test-hard-1.cpp test-hard-2.cpp test18_SOURCES = test18.cpp test19_SOURCES = test19.cpp test20_SOURCES = test20.cpp diff --git a/tclap/include/tclap/ArgException.h b/tclap/include/tclap/ArgException.h index f789d1c..2102095 100644 --- a/tclap/include/tclap/ArgException.h +++ b/tclap/include/tclap/ArgException.h @@ -5,6 +5,7 @@ * file: ArgException.h * * Copyright (c) 2003, Michael E. Smoot . + * Copyright (c) 2017 Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/ArgTraits.h b/tclap/include/tclap/ArgTraits.h index 6f364bf..0ccf5e3 100644 --- a/tclap/include/tclap/ArgTraits.h +++ b/tclap/include/tclap/ArgTraits.h @@ -5,6 +5,7 @@ * file: ArgTraits.h * * Copyright (c) 2007, Daniel Aarno, Michael E. Smoot . + * Copyright (c) 2017 Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/CmdLine.h b/tclap/include/tclap/CmdLine.h index 66e428d..be78985 100644 --- a/tclap/include/tclap/CmdLine.h +++ b/tclap/include/tclap/CmdLine.h @@ -355,7 +355,7 @@ inline CmdLine::CmdLine(const std::string& m, _constructor(); } -CmdLine::~CmdLine() +inline CmdLine::~CmdLine() { ClearContainer(_argDeleteOnExitList); ClearContainer(_visitorDeleteOnExitList); @@ -366,7 +366,7 @@ CmdLine::~CmdLine() } } -void CmdLine::_constructor() +inline void CmdLine::_constructor() { _output = new StdOutput; @@ -403,7 +403,7 @@ void CmdLine::_constructor() deleteOnExit(v); } -void CmdLine::xorAdd( const std::vector& ors ) +inline void CmdLine::xorAdd( const std::vector& ors ) { _xorHandler.add( ors ); @@ -415,7 +415,7 @@ void CmdLine::xorAdd( const std::vector& ors ) } } -void CmdLine::xorAdd( Arg& a, Arg& b ) +inline void CmdLine::xorAdd( Arg& a, Arg& b ) { std::vector ors; ors.push_back( &a ); @@ -423,12 +423,12 @@ void CmdLine::xorAdd( Arg& a, Arg& b ) xorAdd( ors ); } -void CmdLine::add( Arg& a ) +inline void CmdLine::add( Arg& a ) { add( &a ); } -void CmdLine::add( Arg* a ) +inline void CmdLine::add( Arg* a ) { for( ArgListIterator it = _argList.begin(); it != _argList.end(); it++ ) if ( *a == *(*it) ) @@ -442,7 +442,8 @@ void CmdLine::add( Arg* a ) _numRequired++; } -void CmdLine::parse(int argc, const char * const * argv) + +inline void CmdLine::parse(int argc, const char * const * argv) { // this step is necessary so that we have easy access to // mutable strings. @@ -520,7 +521,7 @@ inline void CmdLine::parse(std::vector& args) exit(estat); } -bool CmdLine::_emptyCombined(const std::string& s) +inline bool CmdLine::_emptyCombined(const std::string& s) { if ( s.length() > 0 && s[0] != Arg::flagStartChar() ) return false; @@ -532,7 +533,7 @@ bool CmdLine::_emptyCombined(const std::string& s) return true; } -void CmdLine::missingArgsException() +inline void CmdLine::missingArgsException() { int count = 0; @@ -559,22 +560,22 @@ void CmdLine::missingArgsException() throw(CmdLineParseException(msg)); } -void CmdLine::deleteOnExit(Arg* ptr) +inline void CmdLine::deleteOnExit(Arg* ptr) { _argDeleteOnExitList.push_back(ptr); } -void CmdLine::deleteOnExit(Visitor* ptr) +inline void CmdLine::deleteOnExit(Visitor* ptr) { _visitorDeleteOnExitList.push_back(ptr); } -CmdLineOutput* CmdLine::getOutput() +inline CmdLineOutput* CmdLine::getOutput() { return _output; } -void CmdLine::setOutput(CmdLineOutput* co) +inline void CmdLine::setOutput(CmdLineOutput* co) { if ( !_userSetOutput ) delete _output; @@ -582,37 +583,37 @@ void CmdLine::setOutput(CmdLineOutput* co) _output = co; } -std::string& CmdLine::getVersion() +inline std::string& CmdLine::getVersion() { return _version; } -std::string& CmdLine::getProgramName() +inline std::string& CmdLine::getProgramName() { return _progName; } -std::list& CmdLine::getArgList() +inline std::list& CmdLine::getArgList() { return _argList; } -XorHandler& CmdLine::getXorHandler() +inline XorHandler& CmdLine::getXorHandler() { return _xorHandler; } -char CmdLine::getDelimiter() +inline char CmdLine::getDelimiter() { return _delimiter; } -std::string& CmdLine::getMessage() +inline std::string& CmdLine::getMessage() { return _message; } -bool CmdLine::hasHelpAndVersion() +inline bool CmdLine::hasHelpAndVersion() { return _helpAndVersion; } diff --git a/tclap/include/tclap/CmdLineInterface.h b/tclap/include/tclap/CmdLineInterface.h index 60a7161..a9bdca0 100644 --- a/tclap/include/tclap/CmdLineInterface.h +++ b/tclap/include/tclap/CmdLineInterface.h @@ -7,6 +7,7 @@ * * Copyright (c) 2003, Michael E. Smoot . * Copyright (c) 2004, Michael E. Smoot, Daniel Aarno. + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/CmdLineOutput.h b/tclap/include/tclap/CmdLineOutput.h index a25bd37..cbc9a32 100644 --- a/tclap/include/tclap/CmdLineOutput.h +++ b/tclap/include/tclap/CmdLineOutput.h @@ -7,6 +7,7 @@ * file: CmdLineOutput.h * * Copyright (c) 2004, Michael E. Smoot + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/Constraint.h b/tclap/include/tclap/Constraint.h index e679c88..ff869cc 100644 --- a/tclap/include/tclap/Constraint.h +++ b/tclap/include/tclap/Constraint.h @@ -6,6 +6,7 @@ * file: Constraint.h * * Copyright (c) 2005, Michael E. Smoot + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/DocBookOutput.h b/tclap/include/tclap/DocBookOutput.h index 5651253..80b10e5 100644 --- a/tclap/include/tclap/DocBookOutput.h +++ b/tclap/include/tclap/DocBookOutput.h @@ -5,6 +5,7 @@ * file: DocBookOutput.h * * Copyright (c) 2004, Michael E. Smoot + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/MultiArg.h b/tclap/include/tclap/MultiArg.h index a11b375..432a120 100644 --- a/tclap/include/tclap/MultiArg.h +++ b/tclap/include/tclap/MultiArg.h @@ -6,6 +6,7 @@ * * Copyright (c) 2003, Michael E. Smoot . * Copyright (c) 2004, Michael E. Smoot, Daniel Aarno. + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/MultiSwitchArg.h b/tclap/include/tclap/MultiSwitchArg.h index 0b61766..e333ea7 100644 --- a/tclap/include/tclap/MultiSwitchArg.h +++ b/tclap/include/tclap/MultiSwitchArg.h @@ -8,6 +8,7 @@ * Copyright (c) 2003, Michael E. Smoot . * Copyright (c) 2004, Michael E. Smoot, Daniel Aarno. * Copyright (c) 2005, Michael E. Smoot, Daniel Aarno, Erik Zeek. +* Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/StandardTraits.h b/tclap/include/tclap/StandardTraits.h index 9eb8f94..5864f77 100644 --- a/tclap/include/tclap/StandardTraits.h +++ b/tclap/include/tclap/StandardTraits.h @@ -5,6 +5,7 @@ * file: StandardTraits.h * * Copyright (c) 2007, Daniel Aarno, Michael E. Smoot . + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/StdOutput.h b/tclap/include/tclap/StdOutput.h index 09447a1..b717fc7 100644 --- a/tclap/include/tclap/StdOutput.h +++ b/tclap/include/tclap/StdOutput.h @@ -5,6 +5,7 @@ * file: StdOutput.h * * Copyright (c) 2004, Michael E. Smoot + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for @@ -168,7 +169,7 @@ StdOutput::_shortUsage( CmdLineInterface& _cmd, XorHandler xorHandler = _cmd.getXorHandler(); std::vector< std::vector > xorList = xorHandler.getXorList(); - std::string s = progName; + std::string s = progName + " "; spacePrint( os, s, 75, 2, 6 ); s.clear(); diff --git a/tclap/include/tclap/SwitchArg.h b/tclap/include/tclap/SwitchArg.h index 14489cf..4ca130d 100644 --- a/tclap/include/tclap/SwitchArg.h +++ b/tclap/include/tclap/SwitchArg.h @@ -6,6 +6,7 @@ * * Copyright (c) 2003, Michael E. Smoot . * Copyright (c) 2004, Michael E. Smoot, Daniel Aarno. + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/UnlabeledMultiArg.h b/tclap/include/tclap/UnlabeledMultiArg.h index 6b406b8..48feb84 100644 --- a/tclap/include/tclap/UnlabeledMultiArg.h +++ b/tclap/include/tclap/UnlabeledMultiArg.h @@ -6,6 +6,7 @@ * file: UnlabeledMultiArg.h * * Copyright (c) 2003, Michael E. Smoot. + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/UnlabeledValueArg.h b/tclap/include/tclap/UnlabeledValueArg.h index 6fdbff3..341a3c0 100644 --- a/tclap/include/tclap/UnlabeledValueArg.h +++ b/tclap/include/tclap/UnlabeledValueArg.h @@ -7,6 +7,7 @@ * * Copyright (c) 2003, Michael E. Smoot . * Copyright (c) 2004, Michael E. Smoot, Daniel Aarno. + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/ValueArg.h b/tclap/include/tclap/ValueArg.h index b5289ba..dee023a 100644 --- a/tclap/include/tclap/ValueArg.h +++ b/tclap/include/tclap/ValueArg.h @@ -6,6 +6,7 @@ * * Copyright (c) 2003, Michael E. Smoot . * Copyright (c) 2004, Michael E. Smoot, Daniel Aarno. + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/tclap/include/tclap/ValuesConstraint.h b/tclap/include/tclap/ValuesConstraint.h index ea9d832..3c4dca0 100644 --- a/tclap/include/tclap/ValuesConstraint.h +++ b/tclap/include/tclap/ValuesConstraint.h @@ -7,6 +7,7 @@ * file: ValuesConstraint.h * * Copyright (c) 2005, Michael E. Smoot + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for @@ -54,7 +55,7 @@ class ValuesConstraint : public Constraint * Constructor. * \param allowed - vector of allowed values. */ - ValuesConstraint(std::vector& allowed); + ValuesConstraint(std::vectorconst& allowed); /** * Virtual destructor. @@ -93,7 +94,7 @@ class ValuesConstraint : public Constraint }; template -ValuesConstraint::ValuesConstraint(std::vector& allowed) +ValuesConstraint::ValuesConstraint(std::vector const& allowed) : _allowed(allowed), _typeDesc("") { diff --git a/tclap/include/tclap/Visitor.h b/tclap/include/tclap/Visitor.h index 0d30ca3..2a7bfd1 100644 --- a/tclap/include/tclap/Visitor.h +++ b/tclap/include/tclap/Visitor.h @@ -6,6 +6,7 @@ * file: Visitor.h * * Copyright (c) 2003, Michael E. Smoot . + * Copyright (c) 2017, Google LLC * All rights reserved. * * See the file COPYING in the top directory of this distribution for diff --git a/test/Docker/Makefile b/test/Docker/Makefile index d08e516..839974c 100644 --- a/test/Docker/Makefile +++ b/test/Docker/Makefile @@ -6,7 +6,7 @@ DOCKER = docker # DockerHub organization and repository to pull/push the images from/to -ORG = slicer +ORG = hjmjohnson REPO = slicerexecutionmodel DIRECTORIES = \