diff options
| author | gatecat <gatecat@ds0.me> | 2021-03-18 21:38:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 21:38:02 +0000 |
| commit | bc3fe7d014d082c4e2b7b66f9e154fc8305d2c28 (patch) | |
| tree | 50e3f6ec6c8787e312c14e1d4204d6f2c5543cc0 /common | |
| parent | b8678e778ed4dde0c477a93156c3fd39dffc517f (diff) | |
| parent | a3dd5b33bc1034d6e8fae0e09a9f3570a1d15c5f (diff) | |
| download | nextpnr-bc3fe7d014d082c4e2b7b66f9e154fc8305d2c28.tar.gz nextpnr-bc3fe7d014d082c4e2b7b66f9e154fc8305d2c28.tar.bz2 nextpnr-bc3fe7d014d082c4e2b7b66f9e154fc8305d2c28.zip | |
Merge pull request #630 from litghost/run_clangformat
Run "make clangformat" to fix up master.
Diffstat (limited to 'common')
| -rw-r--r-- | common/basectx.cc | 2 | ||||
| -rw-r--r-- | common/context.cc | 2 | ||||
| -rw-r--r-- | common/nextpnr.cc | 2 | ||||
| -rw-r--r-- | common/property.cc | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/common/basectx.cc b/common/basectx.cc index f271f0f3..da33eecc 100644 --- a/common/basectx.cc +++ b/common/basectx.cc @@ -21,8 +21,8 @@ #include <boost/algorithm/string.hpp> -#include "design_utils.h" #include "context.h" +#include "design_utils.h" #include "log.h" NEXTPNR_NAMESPACE_BEGIN diff --git a/common/context.cc b/common/context.cc index c85f40de..05c1e094 100644 --- a/common/context.cc +++ b/common/context.cc @@ -19,8 +19,8 @@ #include "context.h" -#include "nextpnr_namespaces.h" #include "log.h" +#include "nextpnr_namespaces.h" #include "util.h" NEXTPNR_NAMESPACE_BEGIN diff --git a/common/nextpnr.cc b/common/nextpnr.cc index f8914ea5..7e3d1e00 100644 --- a/common/nextpnr.cc +++ b/common/nextpnr.cc @@ -18,8 +18,8 @@ */ #if defined(__wasm) -#include <typeinfo> #include <exception> +#include <typeinfo> #include "log.h" extern "C" { diff --git a/common/property.cc b/common/property.cc index 945462f8..76cb8bf8 100644 --- a/common/property.cc +++ b/common/property.cc @@ -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) {} - std::string Property::to_string() const { if (is_string) { |