diff options
-rw-r--r-- | TAO/ChangeLog | 8 | ||||
-rw-r--r-- | TAO/tests/Bug_3315_Regression/main.cpp | 3 | ||||
-rw-r--r-- | TAO/tests/Bug_3321_Regression/main.cpp | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5f7033e0366..99ac2124a27 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Jun 10 11:46:44 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * tests/Bug_3315_Regression/main.cpp: + * tests/Bug_3321_Regression/main.cpp: + + For SunCC only, added an extern "C" to the declaration of + main_orb() to avoid warnings. + Tue Jun 10 11:38:15 UTC 2008 Chad Elliott <elliott_c@ociweb.com> * examples/RTScheduling/DT_Creator.cpp: diff --git a/TAO/tests/Bug_3315_Regression/main.cpp b/TAO/tests/Bug_3315_Regression/main.cpp index 5618cae3f7c..5c4abe02ce0 100644 --- a/TAO/tests/Bug_3315_Regression/main.cpp +++ b/TAO/tests/Bug_3315_Regression/main.cpp @@ -7,6 +7,9 @@ int result = 0; +#if defined (__SUNPRO_CC) +extern "C" +#endif /* __SUNPRO_CC */ ACE_THR_FUNC_RETURN main_orb(void*) { try diff --git a/TAO/tests/Bug_3321_Regression/main.cpp b/TAO/tests/Bug_3321_Regression/main.cpp index 434353f2263..f52f393db3e 100644 --- a/TAO/tests/Bug_3321_Regression/main.cpp +++ b/TAO/tests/Bug_3321_Regression/main.cpp @@ -13,6 +13,9 @@ int result = 0; +#if defined (__SUNPRO_CC) +extern "C" +#endif /* __SUNPRO_CC */ ACE_THR_FUNC_RETURN main_orb(void*) { try |