diff options
| author | Georgey | 2017-03-15 16:34:53 +0530 |
|---|---|---|
| committer | Georgey | 2017-03-15 16:34:53 +0530 |
| commit | f455f9b3c105292ccba94f2b5fe0f57cfe4b799c (patch) | |
| tree | 77d4c00636d5e62e659f486f685990d2388073a1 /thirdparty/linux/include/coin/IpOptionsList.hpp | |
| parent | e9d5a25d2eb1950e5ce0adf29a67850e38d23dd3 (diff) | |
| download | symphony-f455f9b3c105292ccba94f2b5fe0f57cfe4b799c.tar.gz symphony-f455f9b3c105292ccba94f2b5fe0f57cfe4b799c.tar.bz2 symphony-f455f9b3c105292ccba94f2b5fe0f57cfe4b799c.zip | |
Added header files for Ipopt 3.12.7,minor modifications to symphony's output texts
Diffstat (limited to 'thirdparty/linux/include/coin/IpOptionsList.hpp')
| -rw-r--r-- | thirdparty/linux/include/coin/IpOptionsList.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/linux/include/coin/IpOptionsList.hpp b/thirdparty/linux/include/coin/IpOptionsList.hpp index 382428e..a17863f 100644 --- a/thirdparty/linux/include/coin/IpOptionsList.hpp +++ b/thirdparty/linux/include/coin/IpOptionsList.hpp @@ -2,7 +2,7 @@ // All Rights Reserved. // This code is published under the Eclipse Public License. // -// $Id: IpOptionsList.hpp 1861 2010-12-21 21:34:47Z andreasw $ +// $Id: IpOptionsList.hpp 2613 2015-11-04 14:42:02Z stefan $ // // Authors: Carl Laird, Andreas Waechter IBM 2004-08-13 @@ -232,7 +232,7 @@ namespace Ipopt /** Read options from the stream is. Returns false if * an error was encountered. */ - virtual bool ReadFromStream(const Journalist& jnlst, std::istream& is); + virtual bool ReadFromStream(const Journalist& jnlst, std::istream& is, bool allow_clobber = false); private: /**@name Default Compiler Generated Methods |