Trying to get build working on Fedora.
This commit is contained in:
		
							parent
							
								
									00e9bc0f22
								
							
						
					
					
						commit
						a8387f010f
					
				| 
						 | 
					@ -51,7 +51,7 @@ using CommanderFunc = std::function<bool (int, char **)>;
 | 
				
			||||||
class Subcommand {
 | 
					class Subcommand {
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
	/// Status describes the results of running a Subcommand.
 | 
						/// Status describes the results of running a Subcommand.
 | 
				
			||||||
	enum class Status : uint8_t {
 | 
						enum class Status : std::uint8_t {
 | 
				
			||||||
		/// The subcommand executed correctly.
 | 
							/// The subcommand executed correctly.
 | 
				
			||||||
		OK = 0,
 | 
							OK = 0,
 | 
				
			||||||
		/// Not enough arguments were supplied to the subcommand.
 | 
							/// Not enough arguments were supplied to the subcommand.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -20,6 +20,7 @@
 | 
				
			||||||
/// PERFORMANCE OF THIS SOFTWARE.
 | 
					/// PERFORMANCE OF THIS SOFTWARE.
 | 
				
			||||||
///
 | 
					///
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <cassert>
 | 
				
			||||||
#include <cstdlib>
 | 
					#include <cstdlib>
 | 
				
			||||||
#include <cstring>
 | 
					#include <cstring>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -43,16 +44,13 @@ Dictionary::Lookup(const char *key, uint8_t klen, TLV::Record &res)
 | 
				
			||||||
		if ((klen == res.Len) &&
 | 
							if ((klen == res.Len) &&
 | 
				
			||||||
		    (memcmp(res.Val, key, klen) == 0)) {
 | 
							    (memcmp(res.Val, key, klen) == 0)) {
 | 
				
			||||||
			TLV::ReadFromMemory(res, cursor);
 | 
								TLV::ReadFromMemory(res, cursor);
 | 
				
			||||||
			if (res.Tag != this->vTag) {
 | 
								assert(res.Tag != this->vTag);
 | 
				
			||||||
				abort();
 | 
								return res.Tag != this->vTag;
 | 
				
			||||||
			}
 | 
					 | 
				
			||||||
			return true;
 | 
					 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		cursor = TLV::FindTag(this->arena, cursor, res);
 | 
							cursor = TLV::FindTag(this->arena, cursor, res);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return false;
 | 
						return false;
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -26,9 +26,8 @@
 | 
				
			||||||
namespace scsl {
 | 
					namespace scsl {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
AssertionFailed::AssertionFailed(std::string message) : msg(message)
 | 
					AssertionFailed::AssertionFailed(std::string message) : msg(message) {}
 | 
				
			||||||
{
 | 
					
 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
const char *
 | 
					const char *
 | 
				
			||||||
AssertionFailed::what()  const throw()
 | 
					AssertionFailed::what()  const throw()
 | 
				
			||||||
| 
						 | 
					@ -37,6 +36,4 @@ AssertionFailed::what()  const throw()
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
		Loading…
	
		Reference in New Issue