From c6c773757ef16aa8edac173a5b9bca270a658b9f Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 23 Jul 2011 11:54:16 -0700
Subject: misc_next_branch_tweaks_to_build_on_osx_and_windows

---
 gr-trellis/src/lib/fsm.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gr-trellis/src')

diff --git a/gr-trellis/src/lib/fsm.cc b/gr-trellis/src/lib/fsm.cc
index 889a3918b..71e54b05a 100644
--- a/gr-trellis/src/lib/fsm.cc
+++ b/gr-trellis/src/lib/fsm.cc
@@ -132,7 +132,7 @@ fsm::fsm(int k, int n, const std::vector<int> &G)
     for(int j=0;j<n;j++) {
       int mem = -1;
       if(G[i*n+j]!=0)
-        mem=(int)(log(G[i*n+j])/log(2.0));
+        mem=(int)(log(double(G[i*n+j]))/log(2.0));
       if(mem>max_mem_x[i])
         max_mem_x[i]=mem;
       if(mem>max_mem)
@@ -417,7 +417,7 @@ void fsm::generate_TM()
       done = find_es(s);
       attempts ++;
     }
-    if (done == false and d_S > 1) {
+    if (done == false && d_S > 1) {
       //throw std::runtime_error ("fsm::generate_TM(): FSM appears to be disconnected\n");
       printf("fsm::generate_TM(): FSM appears to be disconnected\n");
       printf("state %d cannot be reached from all other states\n",s);
-- 
cgit 


From 50b82d2e096e556209e7efdd47e4b67a46d54235 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Tue, 26 Jul 2011 21:58:37 -0400
Subject: Fixed warnings about variable intialization order.

---
 gr-trellis/src/lib/trellis_pccc_decoder_X.h.t           | 2 +-
 gr-trellis/src/lib/trellis_sccc_decoder_X.h.t           | 2 +-
 gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'gr-trellis/src')

diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
index ff4b7a1f8..2a5b43df6 100644
--- a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
+++ b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
@@ -50,9 +50,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 class @NAME@ : public gr_block
 {
   fsm d_FSM1;
-  fsm d_FSM2;
   int d_ST10;
   int d_ST1K;
+  fsm d_FSM2;
   int d_ST20;
   int d_ST2K;
   interleaver d_INTERLEAVER;
diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
index 3adb8a5b7..93c9ac9b8 100644
--- a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
+++ b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
@@ -50,9 +50,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 class @NAME@ : public gr_block
 {
   fsm d_FSMo;
-  fsm d_FSMi;
   int d_STo0;
   int d_SToK;
+  fsm d_FSMi;
   int d_STi0;
   int d_STiK;
   interleaver d_INTERLEAVER;
diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
index 146c26516..225a07ffe 100644
--- a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
+++ b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
@@ -55,9 +55,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 class @NAME@ : public gr_block
 {
   fsm d_FSMo;
-  fsm d_FSMi;
   int d_STo0;
   int d_SToK;
+  fsm d_FSMi;
   int d_STi0;
   int d_STiK;
   interleaver d_INTERLEAVER;
-- 
cgit