include/sal/log-areas.dox | 1 -
sal/qa/osl/process/osl_process.cxx | 24 ++++++------------------
2 files changed, 6 insertions(+), 19 deletions(-)
New commits:
commit 066a81ee8dec07525b8f6c05ee71cf498ea65d72
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Mar 4 12:14:51 2016 +0100
This is test code, OK to unconditionally print to stdout
Change-Id: I419aba8728b3a65fca69c82a4f950daaf4815187
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d4a020a..1ccf4b1 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -32,7 +32,6 @@ certain functionality.
@li @c sal.textenc - the textencoding SAL library
@li @c sal.w32
@li @c sal.test
-@li @c sal.process
@li @c sal.doublelock
@section basctl
diff --git a/sal/qa/osl/process/osl_process.cxx
b/sal/qa/osl/process/osl_process.cxx
index 036be4b..bb1856d 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -276,10 +276,8 @@ public:
string_container_t parent_env;
read_parent_environment(&parent_env);
-#if OSL_DEBUG_LEVEL > 0
for (string_container_t::const_iterator iter = parent_env.begin(), end
= parent_env.end(); iter != end; ++iter)
- SAL_INFO("sal.process", "initially parent env: " << *iter);
-#endif
+ std::cout << "initially parent env: " << *iter << "\n";
//remove the environment variables that we have changed
//in the child environment from the read parent environment
@@ -287,20 +285,16 @@ public:
std::remove_if(parent_env.begin(), parent_env.end(),
exclude(different_env_vars)),
parent_env.end());
-#if OSL_DEBUG_LEVEL > 0
for (string_container_t::const_iterator iter = parent_env.begin(), end
= parent_env.end(); iter != end; ++iter)
- SAL_INFO("sal.process", "stripped parent env: " << *iter);
-#endif
+ std::cout << "stripped parent env: " << *iter << "\n";
//read the child environment and exclude the variables that
//are different
string_container_t child_env;
read_child_environment(&child_env);
-#if OSL_DEBUG_LEVEL > 0
for (string_container_t::const_iterator iter = child_env.begin(), end
= child_env.end(); iter != end; ++iter)
- SAL_INFO("sal.process", "initial child env: " << *iter);
-#endif
+ std::cout << "initial child env: " << *iter << "\n";
//partition the child environment into the variables that
//are different to the parent environment (they come first)
//and the variables that should be equal between parent
@@ -311,23 +305,17 @@ public:
string_container_t different_child_env_vars(child_env.begin(),
iter_logical_end);
child_env.erase(child_env.begin(), iter_logical_end);
-#if OSL_DEBUG_LEVEL > 0
for (string_container_t::const_iterator iter = child_env.begin(), end
= child_env.end(); iter != end; ++iter)
- SAL_INFO("sal.process", "stripped child env: " << *iter);
-#endif
+ std::cout << "stripped child env: " << *iter << "\n";
bool common_env_size_equals = (parent_env.size() ==
child_env.size());
bool common_env_content_equals = std::equal(child_env.begin(),
child_env.end(), parent_env.begin());
-#if OSL_DEBUG_LEVEL > 0
for (string_container_t::const_iterator iter =
different_env_vars.begin(), end = different_env_vars.end(); iter != end; ++iter)
- SAL_INFO("sal.process", "different should be: " << *iter);
-#endif
+ std::cout << "different should be: " << *iter << "\n";
-#if OSL_DEBUG_LEVEL > 0
for (string_container_t::const_iterator iter =
different_child_env_vars.begin(), end = different_child_env_vars.end(); iter !=
end; ++iter)
- SAL_INFO("sal.process", "different are: " << *iter);
-#endif
+ std::cout << "different are: " << *iter << "\n";
bool different_env_size_equals = (different_child_env_vars.size()
== different_env_vars.size());
bool different_env_content_equals =
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
