From 7c3593ea5acef05546be8835e25cf5e4b18549ee Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 20 Jun 2018 12:57:59 +0200
Subject: [PATCH] Updates from clangformat

Signed-off-by: Clifford Wolf <clifford@clifford.at>
---
 common/place_sa.cc         |  5 +++--
 frontend/json/jsonparse.cc | 13 ++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/place_sa.cc b/common/place_sa.cc
index 3162d88c..55ec9b9a 100644
--- a/common/place_sa.cc
+++ b/common/place_sa.cc
@@ -374,8 +374,9 @@ class SAPlacer
         delta = new_wirelength - curr_wirelength;
         n_move++;
         // SA acceptance criterea
-        if (delta < 0 || (temp > 1e-6 && (ctx->rng() / float(0x3fffffff)) <=
-                                                 std::exp(-delta / temp))) {
+        if (delta < 0 ||
+            (temp > 1e-6 &&
+             (ctx->rng() / float(0x3fffffff)) <= std::exp(-delta / temp))) {
             n_accept++;
             if (delta < 0)
                 improved = true;
diff --git a/frontend/json/jsonparse.cc b/frontend/json/jsonparse.cc
index afd126fd..9add256e 100644
--- a/frontend/json/jsonparse.cc
+++ b/frontend/json/jsonparse.cc
@@ -26,8 +26,8 @@
 #include <fstream>
 #include <iostream>
 #include <log.h>
-#include <string>
 #include <map>
+#include <string>
 #include "nextpnr.h"
 
 NEXTPNR_NAMESPACE_BEGIN
@@ -749,12 +749,11 @@ void json_import(Context *ctx, string modname, JsonNode *node)
                     int netid = bits->data_array.at(i)->data_number;
                     if (netid >= netnames.size())
                         netnames.resize(netid + 1);
-                    netnames.at(netid) =
-                            ctx->id(basename +
-                                    (num_bits == 1 ? ""
-                                                   : std::string("[") +
-                                                             std::to_string(i) +
-                                                             std::string("]")));
+                    netnames.at(netid) = ctx->id(
+                            basename +
+                            (num_bits == 1 ? "" : std::string("[") +
+                                                          std::to_string(i) +
+                                                          std::string("]")));
                 }
             }
         }