Fix a bad merge that broke Springboard
authorJosh Stone <jistone@redhat.com>
Thu, 7 Nov 2013 20:16:43 +0000 (12:16 -0800)
committerJosh Stone <jistone@redhat.com>
Thu, 7 Nov 2013 20:16:43 +0000 (12:16 -0800)
commit698521d826a4676fd3cd66be3ce7e52d5250b38d
tree4a399618115a5a7f23babc32f5ed6d383e7bb7f5
parent4806328d7e1cd16b02f403d1d62fc12c73e7c3d2
Fix a bad merge that broke Springboard

In commit 8a035430164e, I removed the 'size' variable from
SpringboardBuilder::generateSpringboard(), as it was not used.

In commit 31b4cd373cd6, Bill initialized 'size' with a proper
value and used it in the call to registerBranch().

When git merged these, it reconciled the changed initialization on its
own, but also kept out a 'size = 1' that I had removed and Bill hadn't
touched.  That assignment is needed now that the variable is used.
dyninstAPI/src/Relocation/Springboard.C