diff options
Diffstat (limited to 'apps/soreduce/Library.cpp')
| -rw-r--r-- | apps/soreduce/Library.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/soreduce/Library.cpp b/apps/soreduce/Library.cpp index 9dfa945d47f..8222415cdf7 100644 --- a/apps/soreduce/Library.cpp +++ b/apps/soreduce/Library.cpp @@ -11,10 +11,10 @@ // library. -#include <ace/OS.h> -#include <ace/OS_Dirent.h> -#include <ace/Log_Msg.h> -#include <ace/streams.h> +#include "ace/OS_NS_dirent.h" +#include "ace/Log_Msg.h" +#include "ace/streams.h" +#include "ace/OS_NS_sys_stat.h" #include "Library.h" @@ -250,13 +250,13 @@ Library::has_modules () const static int selector (const dirent *d) { - return ACE_OS_String::strstr (d->d_name, ".o") != 0; + return ACE_OS::strstr (d->d_name, ".o") != 0; } static int comparator (const dirent **d1, const dirent **d2) { - return ACE_OS_String::strcmp ((*d1)->d_name, (*d2)->d_name); + return ACE_OS::strcmp ((*d1)->d_name, (*d2)->d_name); } void @@ -265,7 +265,7 @@ Library::load_modules () ACE_CString subdir = path_ + "/.shobj"; struct dirent **dent; - num_modules_ = ACE_OS_Dirent::scandir(subdir.c_str(), + num_modules_ = ACE_OS::scandir(subdir.c_str(), &dent,selector,comparator); if (num_modules_ > 0) { @@ -273,12 +273,12 @@ Library::load_modules () for (int i = 0; i < num_modules_; i++) { modules_[i] = new Obj_Module(dent[i]->d_name); modules_[i]->add_source (ACE_CString(subdir + "/" + dent[i]->d_name).c_str()); - ACE_OS_Memory::free(dent[i]); + ACE_OS::free(dent[i]); }; } if (num_modules_ > -1) - ACE_OS_Memory::free(dent); + ACE_OS::free(dent); } void |