Skip to content

Commit 087c020

Browse files
hjmjohnsonhjmjohnson
committed
ENH: Update TCLAP to match master upstream branch
git clone https://git.code.sf.net/p/tclap/code Manually merge changes from d6419ab71623821c5dd02be3bc2835577fa7d525
1 parent 91b921b commit 087c020

24 files changed

+108
-88
lines changed

‎tclap/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
project(TCLAP LANGUAGES CXX)
1+
2+
project(TCLAP VERSION 1.2.2
3+
LANGUAGES CXX)
24

35
# --------------------------------------------------------------------------
46
# Install headers

‎tclap/docs/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ if DOC
44
all:
55
@DOXYGEN@ Doxyfile
66

7+
manual: manual.xml
8+
xsltproc -o manual.html --stringparam html.stylesheet style.css /usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl manual.xml
9+
710
else
811

912
all:

‎tclap/docs/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
To generate the manual from the docbook xml you need and xslt processor
33
and an xsl file that defines the output. For example:
44

5-
xsltproc --stringparam html.stylesheet style.css /Users/mes/software/docbook-xsl-1.71.1/xhtml/docbook.xsl manual.xml > manual.html
5+
xsltproc --stringparam html.stylesheet style.css /usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl manual.xml > manual.html

‎tclap/docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ <h3>Links</h3>
4545
<li>Read the <a href="html/index.html">API documentation</a></li><br/>
4646
<li>Visit the
4747
<a href="http://sourceforge.net/projects/tclap/">SourceForge project page</a></li><br/>
48-
<li>Send <a href="mailto:mes5k@users.sourceforge.net">feedback, comments, patches, etc.</a></li></br>
48+
<li>Send <a href="https://sourceforge.net/p/tclap/_list/tickets">feedback, comments, patches, etc.</a></li></br>
4949
</ul>
5050
</div>
5151
<div class="main">

‎tclap/docs/manual.html

Lines changed: 58 additions & 60 deletions
Large diffs are not rendered by default.

‎tclap/docs/manual.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ The code would look like this:
461461

462462
<programlisting>
463463

464-
UnlabeledValueArg&lt;float&gt; nolabel( "name", "unlabeled test", 3.14,
464+
UnlabeledValueArg&lt;float&gt; nolabel( "name", "unlabeled test", true, 3.14,
465465
"nameString" );
466466
cmd.add( nolabel );
467467

‎tclap/examples/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ test13_SOURCES = test13.cpp
2020
test14_SOURCES = test14.cpp
2121
test15_SOURCES = test15.cpp
2222
test16_SOURCES = test16.cpp
23-
test17_SOURCES = test17.cpp test17-a.cpp
23+
test17_SOURCES = test-hard-1.cpp test-hard-2.cpp
2424
test18_SOURCES = test18.cpp
2525
test19_SOURCES = test19.cpp
2626
test20_SOURCES = test20.cpp

‎tclap/include/tclap/ArgException.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* file: ArgException.h
66
*
77
* Copyright (c) 2003, Michael E. Smoot .
8+
* Copyright (c) 2017 Google LLC
89
* All rights reserved.
910
*
1011
* See the file COPYING in the top directory of this distribution for

‎tclap/include/tclap/ArgTraits.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* file: ArgTraits.h
66
*
77
* Copyright (c) 2007, Daniel Aarno, Michael E. Smoot .
8+
* Copyright (c) 2017 Google LLC
89
* All rights reserved.
910
*
1011
* See the file COPYING in the top directory of this distribution for

‎tclap/include/tclap/CmdLine.h

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ inline CmdLine::CmdLine(const std::string& m,
355355
_constructor();
356356
}
357357

358-
CmdLine::~CmdLine()
358+
inline CmdLine::~CmdLine()
359359
{
360360
ClearContainer(_argDeleteOnExitList);
361361
ClearContainer(_visitorDeleteOnExitList);
@@ -366,7 +366,7 @@ CmdLine::~CmdLine()
366366
}
367367
}
368368

369-
void CmdLine::_constructor()
369+
inline void CmdLine::_constructor()
370370
{
371371
_output = new StdOutput;
372372

@@ -403,7 +403,7 @@ void CmdLine::_constructor()
403403
deleteOnExit(v);
404404
}
405405

406-
void CmdLine::xorAdd( const std::vector<Arg*>& ors )
406+
inline void CmdLine::xorAdd( const std::vector<Arg*>& ors )
407407
{
408408
_xorHandler.add( ors );
409409

@@ -415,20 +415,20 @@ void CmdLine::xorAdd( const std::vector<Arg*>& ors )
415415
}
416416
}
417417

418-
void CmdLine::xorAdd( Arg& a, Arg& b )
418+
inline void CmdLine::xorAdd( Arg& a, Arg& b )
419419
{
420420
std::vector<Arg*> ors;
421421
ors.push_back( &a );
422422
ors.push_back( &b );
423423
xorAdd( ors );
424424
}
425425

426-
void CmdLine::add( Arg& a )
426+
inline void CmdLine::add( Arg& a )
427427
{
428428
add( &a );
429429
}
430430

431-
void CmdLine::add( Arg* a )
431+
inline void CmdLine::add( Arg* a )
432432
{
433433
for( ArgListIterator it = _argList.begin(); it != _argList.end(); it++ )
434434
if ( *a == *(*it) )
@@ -442,7 +442,8 @@ void CmdLine::add( Arg* a )
442442
_numRequired++;
443443
}
444444

445-
void CmdLine::parse(int argc, const char * const * argv)
445+
446+
inline void CmdLine::parse(int argc, const char * const * argv)
446447
{
447448
// this step is necessary so that we have easy access to
448449
// mutable strings.
@@ -520,7 +521,7 @@ inline void CmdLine::parse(std::vector<std::string>& args)
520521
exit(estat);
521522
}
522523

523-
bool CmdLine::_emptyCombined(const std::string& s)
524+
inline bool CmdLine::_emptyCombined(const std::string& s)
524525
{
525526
if ( s.length() > 0 && s[0] != Arg::flagStartChar() )
526527
return false;
@@ -532,7 +533,7 @@ bool CmdLine::_emptyCombined(const std::string& s)
532533
return true;
533534
}
534535

535-
void CmdLine::missingArgsException()
536+
inline void CmdLine::missingArgsException()
536537
{
537538
int count = 0;
538539

@@ -559,60 +560,60 @@ void CmdLine::missingArgsException()
559560
throw(CmdLineParseException(msg));
560561
}
561562

562-
void CmdLine::deleteOnExit(Arg* ptr)
563+
inline void CmdLine::deleteOnExit(Arg* ptr)
563564
{
564565
_argDeleteOnExitList.push_back(ptr);
565566
}
566567

567-
void CmdLine::deleteOnExit(Visitor* ptr)
568+
inline void CmdLine::deleteOnExit(Visitor* ptr)
568569
{
569570
_visitorDeleteOnExitList.push_back(ptr);
570571
}
571572

572-
CmdLineOutput* CmdLine::getOutput()
573+
inline CmdLineOutput* CmdLine::getOutput()
573574
{
574575
return _output;
575576
}
576577

577-
void CmdLine::setOutput(CmdLineOutput* co)
578+
inline void CmdLine::setOutput(CmdLineOutput* co)
578579
{
579580
if ( !_userSetOutput )
580581
delete _output;
581582
_userSetOutput = true;
582583
_output = co;
583584
}
584585

585-
std::string& CmdLine::getVersion()
586+
inline std::string& CmdLine::getVersion()
586587
{
587588
return _version;
588589
}
589590

590-
std::string& CmdLine::getProgramName()
591+
inline std::string& CmdLine::getProgramName()
591592
{
592593
return _progName;
593594
}
594595

595-
std::list<Arg*>& CmdLine::getArgList()
596+
inline std::list<Arg*>& CmdLine::getArgList()
596597
{
597598
return _argList;
598599
}
599600

600-
XorHandler& CmdLine::getXorHandler()
601+
inline XorHandler& CmdLine::getXorHandler()
601602
{
602603
return _xorHandler;
603604
}
604605

605-
char CmdLine::getDelimiter()
606+
inline char CmdLine::getDelimiter()
606607
{
607608
return _delimiter;
608609
}
609610

610-
std::string& CmdLine::getMessage()
611+
inline std::string& CmdLine::getMessage()
611612
{
612613
return _message;
613614
}
614615

615-
bool CmdLine::hasHelpAndVersion()
616+
inline bool CmdLine::hasHelpAndVersion()
616617
{
617618
return _helpAndVersion;
618619
}

0 commit comments

Comments
 (0)