1 files changed, 26 insertions, 25 deletions

diff --git a/ext/mcpat/cacti/basic_circuit.h b/ext/mcpat/cacti/basic_circuit.h
index aaab6c0ea..e4bb5760a 100644
--- a/ext/mcpat/cacti/basic_circuit.h
+++ b/ext/mcpat/cacti/basic_circuit.h
@@ -2,6 +2,7 @@
  *                                McPAT/CACTI
  *                      SOFTWARE LICENSE AGREEMENT
  *            Copyright 2012 Hewlett-Packard Development Company, L.P.
+ *            Copyright (c) 2010-2013 Advanced Micro Devices, Inc.
  *                          All Rights Reserved
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,7 +26,7 @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.”
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  ***************************************************************************/
 
@@ -49,10 +50,10 @@ int combination(int n, int m);
 
 //#define DBG
 #ifdef DBG
-    #define PRINTDW(a);\
+#define PRINTDW(a);\
     a;
 #else
-    #define PRINTDW(a);\
+#define PRINTDW(a);\
 
 #endif
 
@@ -76,7 +77,7 @@ enum Htree_type {
 enum Gate_type {
     nmos,
     pmos,
-        inv,
+    inv,
     nand,
     nor,
     tri,
@@ -164,13 +165,13 @@ double cmos_Ig_n(
     double nWidth,
     bool _is_dram = false,
     bool _is_cell = false,
-    bool _is_wl_tr= false);
+    bool _is_wl_tr = false);
 
 double cmos_Ig_p(
     double pWidth,
     bool _is_dram = false,
     bool _is_cell = false,
-    bool _is_wl_tr= false);
+    bool _is_wl_tr = false);
 
 
 double cmos_Isub_leakage(
@@ -220,29 +221,29 @@ double shortcircuit_simple(
     double vdd);
 //set power point product mask; strictly speaking this is not real point product
 inline void set_pppm(
-        double * pppv,
-        double a=1,
-    double b=1,
-    double c=1,
-    double d=1
-    ){
-                pppv[0]= a;
-                pppv[1]= b;
-                pppv[2]= c;
-                pppv[3]= d;
+    double * pppv,
+    double a = 1,
+    double b = 1,
+    double c = 1,
+    double d = 1
+) {
+    pppv[0] = a;
+    pppv[1] = b;
+    pppv[2] = c;
+    pppv[3] = d;
 
 }
 
 inline void set_sppm(
-        double * sppv,
-        double a=1,
-    double b=1,
-    double c=1,
-    double d=1
-    ){
-                sppv[0]= a;
-                sppv[1]= b;
-                sppv[2]= c;
+    double * sppv,
+    double a = 1,
+    double b = 1,
+    double c = 1,
+    double d = 1
+) {
+    sppv[0] = a;
+    sppv[1] = b;
+    sppv[2] = c;
 }
 
 #endif