diff options
| author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2016-11-14 16:41:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-14 16:41:40 +0100 |
| commit | 1ed62f35fba2a840c7470c7813e380b580c5e553 (patch) | |
| tree | ce99962dc0463c211be8a057167519b6aa9d6be4 | |
| parent | 97f350a633b2a14187f7d28c1d273509fee24021 (diff) | |
| parent | 8fafdf71329f4e11e14aa1d786fb782f467a1460 (diff) | |
| download | ATCD-1ed62f35fba2a840c7470c7813e380b580c5e553.tar.gz | |
Merge pull request #329 from jwillemsen/master
Fixed typo and scoping change
| -rwxr-xr-x | TAO/bin/rm_exception_macros.pl | 2 | ||||
| -rw-r--r-- | TAO/tao/CDR.inl | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/TAO/bin/rm_exception_macros.pl b/TAO/bin/rm_exception_macros.pl index 67e5328d4d2..f40f6307387 100755 --- a/TAO/bin/rm_exception_macros.pl +++ b/TAO/bin/rm_exception_macros.pl @@ -6,7 +6,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}' # Author: Chad Elliott # Date: 1/24/2007 # Description: This script attempts to remove the ACE related exception -# macros from source code provided on the comand line. It +# macros from source code provided on the command line. It # is not perfect, but does handle a large number of cases. # You may need to hand edit files after running this # script. diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl index be6a75d6075..fcf3d9d5b13 100644 --- a/TAO/tao/CDR.inl +++ b/TAO/tao/CDR.inl @@ -453,7 +453,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, if (x.bound_ != 0 && x.val_ != 0 && ACE_OS::strlen (x.val_) > x.bound_) { - throw ::CORBA::BAD_PARAM (); + throw CORBA::BAD_PARAM (); } return os << x.val_; } @@ -464,7 +464,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, if (x.bound_ != 0 && x.val_ != 0 && ACE_OS::strlen (x.val_) > x.bound_) { - throw ::CORBA::BAD_PARAM (); + throw CORBA::BAD_PARAM (); } return os << x.val_; } @@ -559,7 +559,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, if (marshal_flag && x.bound_ != 0 && x.val_ != 0 && ACE_OS::strlen (x.val_) > x.bound_) { - throw ::CORBA::BAD_PARAM (); + throw CORBA::BAD_PARAM (); } return marshal_flag; } @@ -572,7 +572,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, if (marshal_flag && x.bound_ != 0 && x.val_ != 0 && ACE_OS::strlen (x.val_) > x.bound_) { - throw ::CORBA::BAD_PARAM (); + throw CORBA::BAD_PARAM (); } return marshal_flag; } @@ -593,7 +593,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Boolean const marshal_flag = is >> x.val_; if (marshal_flag && x.bound_ != 0 && x.val_.size () > x.bound_) { - throw ::CORBA::BAD_PARAM (); + throw CORBA::BAD_PARAM (); } return marshal_flag; } @@ -615,7 +615,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Boolean const marshal_flag = is >> x.val_; if (marshal_flag && x.bound_ != 0 && x.val_.size () > x.bound_) { - throw ::CORBA::BAD_PARAM (); + throw CORBA::BAD_PARAM (); } return marshal_flag; } |