summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Savia <ops@iki.fi>2004-09-03 18:42:56 +0000
committerOlli Savia <ops@iki.fi>2004-09-03 18:42:56 +0000
commitc06f55161d4fe38873d05aa9ab144a08fcd764e5 (patch)
tree3c957efb8ed9170eaf2b122cf131100bf61e00bc
parent8c403460be5b4cf084ea66a98016346a7465c875 (diff)
downloadATCD-c06f55161d4fe38873d05aa9ab144a08fcd764e5.tar.gz
ChangeLogTag: Fri Sep 3 21:36:51 2004 Olli Savia <ops@iki.fi>
-rw-r--r--ChangeLog16
-rw-r--r--apps/drwho/File_Manager.cpp3
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index a1ed0654ff0..0fb32dc5616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+Fri Sep 3 21:36:51 2004 Olli Savia <ops@iki.fi>
+
+ * apps/drwho/File_Manager.cpp:
+ Use ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
+ to check if explicit template instantiation is needed.
+ Thanks to Johnny Willemsen for informing me about this
+ macro.
+
Fri Sep 3 20:02:20 2004 Olli Savia <ops@iki.fi>
* ace/OS_NS_unistd.inl:
There is no need to check missing prototype since this has
already been taken care by os_unistd.h.
-
+
* ace/os_include/arpa/os_inet.h:
* ace/os_include/os_stdlib.h:
* ace/os_include/os_strings.h:
@@ -11,13 +19,13 @@ Fri Sep 3 20:02:20 2004 Olli Savia <ops@iki.fi>
To make things easier to maintain use new ACE_LACKS_xxx_PROTOTYPE
macros to check whether we need to declare missing function
prototype.
-
+
* ace/README:
Added new ACE_LACKS_xxx_PROTOTYPE macros
-
+
* ace/config-lynxos.h:
Modified to follow changes above.
-
+
Fri Sep 3 19:35:48 2004 Olli Savia <ops@iki.fi>
* ace/Log_Msg.h:
diff --git a/apps/drwho/File_Manager.cpp b/apps/drwho/File_Manager.cpp
index 19d81f38336..5f138fe70fc 100644
--- a/apps/drwho/File_Manager.cpp
+++ b/apps/drwho/File_Manager.cpp
@@ -173,8 +173,7 @@ template class ACE_Singleton<File_Manager,ACE_Null_Mutex>;
#pragma instantiate ACE_Singleton<File_Manager,ACE_Null_Mutex>
-#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux) || defined (__Lynx__))
-
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
template ACE_Singleton<File_Manager, ACE_Null_Mutex> *
ACE_Singleton<File_Manager, ACE_Null_Mutex>::singleton_;