Merge pull request #630 from litghost/run_clangformat
Run "make clangformat" to fix up master.
This commit is contained in:
commit
bc3fe7d014
@ -21,8 +21,8 @@
|
|||||||
|
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
|
|
||||||
#include "design_utils.h"
|
|
||||||
#include "context.h"
|
#include "context.h"
|
||||||
|
#include "design_utils.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
|
||||||
NEXTPNR_NAMESPACE_BEGIN
|
NEXTPNR_NAMESPACE_BEGIN
|
||||||
|
@ -19,8 +19,8 @@
|
|||||||
|
|
||||||
#include "context.h"
|
#include "context.h"
|
||||||
|
|
||||||
#include "nextpnr_namespaces.h"
|
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
#include "nextpnr_namespaces.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
NEXTPNR_NAMESPACE_BEGIN
|
NEXTPNR_NAMESPACE_BEGIN
|
||||||
|
@ -18,8 +18,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#if defined(__wasm)
|
#if defined(__wasm)
|
||||||
#include <typeinfo>
|
|
||||||
#include <exception>
|
#include <exception>
|
||||||
|
#include <typeinfo>
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -36,7 +36,6 @@ Property::Property(const std::string &strval) : is_string(true), str(strval), in
|
|||||||
|
|
||||||
Property::Property(State bit) : is_string(false), str(std::string("") + char(bit)), intval(bit == S1) {}
|
Property::Property(State bit) : is_string(false), str(std::string("") + char(bit)), intval(bit == S1) {}
|
||||||
|
|
||||||
|
|
||||||
std::string Property::to_string() const
|
std::string Property::to_string() const
|
||||||
{
|
{
|
||||||
if (is_string) {
|
if (is_string) {
|
||||||
|
Loading…
Reference in New Issue
Block a user