summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--netfs/lib/Jamfile.jam9
-rw-r--r--netfs/lib/entCache.cpp20
2 files changed, 15 insertions, 14 deletions
diff --git a/netfs/lib/Jamfile.jam b/netfs/lib/Jamfile.jam
index a2d3454..e1199a8 100644
--- a/netfs/lib/Jamfile.jam
+++ b/netfs/lib/Jamfile.jam
@@ -2,10 +2,13 @@ lib netfs-common :
[ glob *.cpp ]
:
<include>../ice
- <library>../ice//netfs-api
- <library>..//adhocutil
- <implicit-dependency>../ice//netfs-api
+ <link>static
+ <use>..//adhocutil/<link>shared
+ <implicit-dependency>../ice//netfs-api/<link>shared
+ <cxxflags>-fPIC
: :
<include>.
+ <library>../ice//netfs-api/<link>shared
+ <library>..//adhocutil/<link>shared
;
diff --git a/netfs/lib/entCache.cpp b/netfs/lib/entCache.cpp
index 0e8e638..26d275b 100644
--- a/netfs/lib/entCache.cpp
+++ b/netfs/lib/entCache.cpp
@@ -3,8 +3,6 @@
#include <lockHelpers.h>
#include <pwd.h>
#include <grp.h>
-#include <visibility.h>
-
template<class entry_t>
void
@@ -112,18 +110,18 @@ EntCache<Group>::fillCache() const
}
bool
-DLL_PUBLIC Group::hasMember(uid_t u) const
+Group::hasMember(uid_t u) const
{
return (members.find(u) != members.end());
}
-template std::shared_ptr<User> DLL_PUBLIC EntCache<User>::getEntry<std::string>(const std::string &) const;
-template std::shared_ptr<User> DLL_PUBLIC EntCache<User>::getEntry<uid_t>(const uid_t &) const;
-template DLL_PUBLIC void EntCache<User>::getName(const gid_t &, std::string *) const;
-template DLL_PUBLIC void EntCache<User>::getID(const std::string &, gid_t *) const;
+template std::shared_ptr<User> EntCache<User>::getEntry<std::string>(const std::string &) const;
+template std::shared_ptr<User> EntCache<User>::getEntry<uid_t>(const uid_t &) const;
+template void EntCache<User>::getName(const gid_t &, std::string *) const;
+template void EntCache<User>::getID(const std::string &, gid_t *) const;
-template std::shared_ptr<Group> DLL_PUBLIC EntCache<Group>::getEntry<std::string>(const std::string &) const;
-template std::shared_ptr<Group> DLL_PUBLIC EntCache<Group>::getEntry<gid_t>(const gid_t &) const;
-template DLL_PUBLIC void EntCache<Group>::getName(const gid_t &, std::string *) const;
-template DLL_PUBLIC void EntCache<Group>::getID(const std::string &, gid_t *) const;
+template std::shared_ptr<Group> EntCache<Group>::getEntry<std::string>(const std::string &) const;
+template std::shared_ptr<Group> EntCache<Group>::getEntry<gid_t>(const gid_t &) const;
+template void EntCache<Group>::getName(const gid_t &, std::string *) const;
+template void EntCache<Group>::getID(const std::string &, gid_t *) const;