From 6adfa4ca642ba281923230f1d307b1c32034bf30 Mon Sep 17 00:00:00 2001 From: sma Date: Mon, 20 May 2013 13:10:34 +0000 Subject: Mon May 20 13:10:00 UTC 2013 Simon Massey Remove dead code and unused state variable (expect_char). --- TAO/ChangeLog | 6 ++++++ TAO/tao/params.cpp | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b4aac11a0a5..4c1d5143d93 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon May 20 13:10:00 UTC 2013 Simon Massey + + * tao/params.cpp: + + Remove dead code and unused state variable (expect_char). + Mon May 20 12:15:00 UTC 2013 Simon Massey * bin/tao_other_tests.lst: diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp index 4eaa9a473c9..e7fcf66c13e 100644 --- a/TAO/tao/params.cpp +++ b/TAO/tao/params.cpp @@ -226,7 +226,6 @@ TAO_ORB_Parameters::check_preferred_interfaces_string (const char *s) // treated as wildcards. bool expect_assign = false; bool expect_comma = false; - bool expect_char = true; bool expect_wild = true; bool found_remote = false; @@ -242,7 +241,6 @@ TAO_ORB_Parameters::check_preferred_interfaces_string (const char *s) return false; found_remote = true; expect_assign = false; - expect_char = true; expect_comma = false; expect_wild = true; break; @@ -252,7 +250,6 @@ TAO_ORB_Parameters::check_preferred_interfaces_string (const char *s) return false; found_remote = false; expect_assign = false; - expect_char = true; expect_comma = false; expect_wild = true; break; @@ -262,16 +259,12 @@ TAO_ORB_Parameters::check_preferred_interfaces_string (const char *s) if (!expect_wild) return false; expect_assign = !found_remote; - expect_char = true; expect_comma = found_remote; expect_wild = false; break; default: - if (!expect_char) - return false; expect_assign = !found_remote; - expect_char = true; expect_comma = found_remote; expect_wild = true; break; -- cgit v1.2.1