summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza-oci@users.noreply.github.com>2012-04-10 20:11:35 +0000
committerAdam Mitz <mitza-oci@users.noreply.github.com>2012-04-10 20:11:35 +0000
commit7cce0e852f744b20ab7643924e14085eee03b6d6 (patch)
tree16d6066efd5f4cf0d8ac023dfcc7d25976a120a2
parent1d4cf5c9c2cce2080549230ec72a32a9f09590cd (diff)
downloadATCD-7cce0e852f744b20ab7643924e14085eee03b6d6.tar.gz
ChangeLogTag: Tue Apr 10 20:10:06 UTC 2012 Adam Mitz <mitza@ociweb.com>
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/bin/MakeProjectCreator/templates/gnu.mpd2
2 files changed, 8 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index de5b7e905ae..0beb3994c72 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Tue Apr 10 20:10:06 UTC 2012 Adam Mitz <mitza@ociweb.com>
+
+ * bin/MakeProjectCreator/templates/gnu.mpd:
+
+ Install the Inline_Files even with inline=0. Many of these files
+ are still needed, especially *_T.inl. This resolves bug #4002.
+
Mon Apr 9 21:57:39 UTC 2012 Steve Huston <shuston@riverace.com>
* ace/Timer_Queue_T.cpp (calculate_timeout): Lock the mutex before
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
index 606af999644..b7705739f29 100644
--- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
@@ -798,7 +798,7 @@ CUSTOM_INST_TAGS = $(sort <%custom_install%> <%foreach(custom_types)%><%foreach(
<%if(staticname || sharedname)%>
<%if(install_headers)%>
-LIB_INST_TAGS = header_files template_files$(if $(findstring 1,$(inline)), inline_files)$(if $(CUSTOM_INST_TAGS), $(CUSTOM_INST_TAGS))
+LIB_INST_TAGS = header_files template_files inline_files$(if $(CUSTOM_INST_TAGS), $(CUSTOM_INST_TAGS))
LIB_INST_LOCATIONS = $(foreach tag,$(LIB_INST_TAGS),-b $(tag)=include$(INST_DIR))
<%else%>