summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-07 09:09:44 +0000
committerjxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-07 09:09:44 +0000
commit22539e030d0749a4b1b8889bdbc0565c36ac3d87 (patch)
treebf5f4b717f2818b12fed1e9dda4a56658a44ba57
parentbdf3f6907d8a4367a3d5c579d05d7ab0b8d7c9b0 (diff)
downloadATCD-22539e030d0749a4b1b8889bdbc0565c36ac3d87.tar.gz
ACE-ified the code.
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/Makefile156
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_base.cpp4
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_base.h39
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_base.i53
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_export.h34
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp5
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_headers.h53
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_headers.i65
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_request.cpp4
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_request.h25
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_request.i35
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_response.cpp4
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_response.h19
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_response.i23
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp5
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_status.h21
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/http_status.i24
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.cpp4
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h25
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.i49
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.cpp3
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h26
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.i43
-rw-r--r--apps/JAWS/PROTOTYPE/HTTPU/parse_url.h4
24 files changed, 540 insertions, 183 deletions
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/Makefile b/apps/JAWS/PROTOTYPE/HTTPU/Makefile
index 5e9f9a36e4f..85d1a282fb3 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/Makefile
+++ b/apps/JAWS/PROTOTYPE/HTTPU/Makefile
@@ -55,18 +55,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
$(ACE_ROOT)/ace/Log_Msg.h \
$(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
$(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- ../HTTPU/parse_url.h
+ $(ACE_ROOT)/ace/Log_Record.i ../HTTPU/parse_url.h \
+ ../HTTPU/http_export.h
.obj/parse_http_request.o .obj/parse_http_request.so .shobj/parse_http_request.o .shobj/parse_http_request.so: parse_http_request.cpp \
- ../HTTPU/parse_http_request.h \
- $(ACE_ROOT)/ace/OS.h \
+ ../HTTPU/parse_http_request.h $(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
$(ACE_ROOT)/ace/config.h \
$(ACE_ROOT)/ace/config-sunos5.5.h \
@@ -74,15 +71,12 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
$(ACE_ROOT)/ace/Log_Msg.h \
$(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
$(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- ../HTTPU/http_headers.h \
+ $(ACE_ROOT)/ace/Log_Record.i ../HTTPU/http_headers.h \
$(ACE_ROOT)/ace/RB_Tree.h \
$(ACE_ROOT)/ace/RB_Tree.i \
$(ACE_ROOT)/ace/RB_Tree.cpp \
@@ -92,13 +86,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
$(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
$(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
$(ACE_ROOT)/ace/Event_Handler.h \
$(ACE_ROOT)/ace/Event_Handler.i \
$(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
$(ACE_ROOT)/ace/Atomic_Op.i \
$(ACE_ROOT)/ace/Synch_T.cpp \
$(ACE_ROOT)/ace/Singleton.i \
@@ -107,8 +99,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/Object_Manager.i \
$(ACE_ROOT)/ace/Managed_Object.h \
$(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- ../JAWS/Parse_Headers.h \
+ $(ACE_ROOT)/ace/Managed_Object.cpp ../JAWS/Parse_Headers.h \
$(ACE_ROOT)/ace/Message_Block.h \
$(ACE_ROOT)/ace/Malloc.h \
$(ACE_ROOT)/ace/Malloc_Base.h \
@@ -130,11 +121,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/Mem_Map.h \
$(ACE_ROOT)/ace/Mem_Map.i \
$(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- ../JAWS/Headers.h
+ $(ACE_ROOT)/ace/Message_Block.i ../JAWS/Headers.h \
+ ../HTTPU/http_export.h ../HTTPU/http_headers.i \
+ ../HTTPU/parse_http_request.i
.obj/parse_http_response.o .obj/parse_http_response.so .shobj/parse_http_response.o .shobj/parse_http_response.so: parse_http_response.cpp \
- ../HTTPU/parse_http_response.h \
- $(ACE_ROOT)/ace/OS.h \
+ ../HTTPU/parse_http_response.h $(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
$(ACE_ROOT)/ace/config.h \
$(ACE_ROOT)/ace/config-sunos5.5.h \
@@ -142,18 +133,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
$(ACE_ROOT)/ace/Log_Msg.h \
$(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \
$(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
+ $(ACE_ROOT)/ace/Log_Record.i ../HTTPU/http_export.h \
+ ../HTTPU/parse_http_response.i
.obj/http_request.o .obj/http_request.so .shobj/http_request.o .shobj/http_request.so: http_request.cpp ../HTTPU/http_request.h \
$(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
$(ACE_ROOT)/ace/config.h \
$(ACE_ROOT)/ace/config-sunos5.5.h \
@@ -161,8 +150,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
$(ACE_ROOT)/ace/Log_Msg.h \
$(ACE_ROOT)/ace/Log_Record.h \
$(ACE_ROOT)/ace/ACE.i \
@@ -177,13 +165,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
$(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
$(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
$(ACE_ROOT)/ace/Event_Handler.h \
$(ACE_ROOT)/ace/Event_Handler.i \
$(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
$(ACE_ROOT)/ace/Atomic_Op.i \
$(ACE_ROOT)/ace/Synch_T.cpp \
$(ACE_ROOT)/ace/Free_List.h \
@@ -207,21 +193,21 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/Mem_Map.h \
$(ACE_ROOT)/ace/Mem_Map.i \
$(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- ../JAWS/Parse_Headers.h \
+ $(ACE_ROOT)/ace/Message_Block.i ../JAWS/Parse_Headers.h \
$(ACE_ROOT)/ace/Singleton.h \
$(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- ../JAWS/Headers.h ../HTTPU/http_base.h ../HTTPU/http_status.h \
- ../HTTPU/http_headers.h \
+ $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Headers.h \
+ ../HTTPU/http_export.h ../HTTPU/http_base.h ../HTTPU/http_status.h \
+ ../HTTPU/http_status.i ../HTTPU/http_headers.h \
$(ACE_ROOT)/ace/RB_Tree.h \
$(ACE_ROOT)/ace/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp \
- ../HTTPU/parse_http_request.h ../HTTPU/parse_url.h
+ $(ACE_ROOT)/ace/RB_Tree.cpp ../HTTPU/http_headers.i \
+ ../HTTPU/http_base.i ../HTTPU/parse_http_request.h \
+ ../HTTPU/parse_http_request.i ../HTTPU/parse_url.h \
+ ../HTTPU/http_request.i
.obj/http_response.o .obj/http_response.so .shobj/http_response.o .shobj/http_response.so: http_response.cpp ../HTTPU/http_response.h \
$(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
$(ACE_ROOT)/ace/config.h \
$(ACE_ROOT)/ace/config-sunos5.5.h \
@@ -229,8 +215,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
$(ACE_ROOT)/ace/Log_Msg.h \
$(ACE_ROOT)/ace/Log_Record.h \
$(ACE_ROOT)/ace/ACE.i \
@@ -245,13 +230,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
$(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
$(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
$(ACE_ROOT)/ace/Event_Handler.h \
$(ACE_ROOT)/ace/Event_Handler.i \
$(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
$(ACE_ROOT)/ace/Atomic_Op.i \
$(ACE_ROOT)/ace/Synch_T.cpp \
$(ACE_ROOT)/ace/Free_List.h \
@@ -275,21 +258,20 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/Mem_Map.h \
$(ACE_ROOT)/ace/Mem_Map.i \
$(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- ../JAWS/Parse_Headers.h \
+ $(ACE_ROOT)/ace/Message_Block.i ../JAWS/Parse_Headers.h \
$(ACE_ROOT)/ace/Singleton.h \
$(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- ../JAWS/Headers.h ../HTTPU/http_base.h ../HTTPU/http_status.h \
- ../HTTPU/http_headers.h \
+ $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Headers.h \
+ ../HTTPU/http_export.h ../HTTPU/http_base.h ../HTTPU/http_status.h \
+ ../HTTPU/http_status.i ../HTTPU/http_headers.h \
$(ACE_ROOT)/ace/RB_Tree.h \
$(ACE_ROOT)/ace/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp \
- ../HTTPU/parse_http_response.h
+ $(ACE_ROOT)/ace/RB_Tree.cpp ../HTTPU/http_headers.i \
+ ../HTTPU/http_base.i ../HTTPU/parse_http_response.h \
+ ../HTTPU/parse_http_response.i ../HTTPU/http_response.i
.obj/http_base.o .obj/http_base.so .shobj/http_base.o .shobj/http_base.so: http_base.cpp ../JAWS/Parse_Headers.h \
$(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \
$(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
$(ACE_ROOT)/ace/config.h \
@@ -298,8 +280,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
$(ACE_ROOT)/ace/Log_Msg.h \
$(ACE_ROOT)/ace/Log_Record.h \
$(ACE_ROOT)/ace/ACE.i \
@@ -309,13 +290,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
$(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
$(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
$(ACE_ROOT)/ace/Event_Handler.h \
$(ACE_ROOT)/ace/Event_Handler.i \
$(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
$(ACE_ROOT)/ace/Atomic_Op.i \
$(ACE_ROOT)/ace/Synch_T.cpp \
$(ACE_ROOT)/ace/Singleton.i \
@@ -346,16 +325,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/Mem_Map.h \
$(ACE_ROOT)/ace/Mem_Map.i \
$(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- ../JAWS/Headers.h ../HTTPU/http_base.h ../HTTPU/http_status.h \
- ../HTTPU/http_headers.h \
+ $(ACE_ROOT)/ace/Message_Block.i ../JAWS/Headers.h \
+ ../HTTPU/http_base.h ../HTTPU/http_export.h ../HTTPU/http_status.h \
+ ../HTTPU/http_status.i ../HTTPU/http_headers.h \
$(ACE_ROOT)/ace/RB_Tree.h \
$(ACE_ROOT)/ace/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp
+ $(ACE_ROOT)/ace/RB_Tree.cpp ../HTTPU/http_headers.i \
+ ../HTTPU/http_base.i
.obj/http_status.o .obj/http_status.so .shobj/http_status.o .shobj/http_status.so: http_status.cpp ../HTTPU/http_status.h \
$(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \
$(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
$(ACE_ROOT)/ace/config.h \
@@ -364,8 +343,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
$(ACE_ROOT)/ace/Log_Msg.h \
$(ACE_ROOT)/ace/Log_Record.h \
$(ACE_ROOT)/ace/ACE.i \
@@ -375,13 +353,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
$(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
$(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
$(ACE_ROOT)/ace/Event_Handler.h \
$(ACE_ROOT)/ace/Event_Handler.i \
$(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
$(ACE_ROOT)/ace/Atomic_Op.i \
$(ACE_ROOT)/ace/Synch_T.cpp \
$(ACE_ROOT)/ace/Singleton.i \
@@ -390,10 +366,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/Object_Manager.i \
$(ACE_ROOT)/ace/Managed_Object.h \
$(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp
+ $(ACE_ROOT)/ace/Managed_Object.cpp ../HTTPU/http_export.h \
+ ../HTTPU/http_status.i
.obj/http_headers.o .obj/http_headers.so .shobj/http_headers.o .shobj/http_headers.so: http_headers.cpp ../HTTPU/http_headers.h \
- $(ACE_ROOT)/ace/RB_Tree.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/RB_Tree.h $(ACE_ROOT)/ace/ACE.h \
$(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
$(ACE_ROOT)/ace/config.h \
@@ -402,8 +378,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
$(ACE_ROOT)/ace/Log_Msg.h \
$(ACE_ROOT)/ace/Log_Record.h \
$(ACE_ROOT)/ace/ACE.i \
@@ -417,13 +392,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
$(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
$(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
$(ACE_ROOT)/ace/Event_Handler.h \
$(ACE_ROOT)/ace/Event_Handler.i \
$(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \
$(ACE_ROOT)/ace/Atomic_Op.i \
$(ACE_ROOT)/ace/Synch_T.cpp \
$(ACE_ROOT)/ace/Singleton.i \
@@ -432,8 +405,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/Object_Manager.i \
$(ACE_ROOT)/ace/Managed_Object.h \
$(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- ../JAWS/Parse_Headers.h \
+ $(ACE_ROOT)/ace/Managed_Object.cpp ../JAWS/Parse_Headers.h \
$(ACE_ROOT)/ace/Message_Block.h \
$(ACE_ROOT)/ace/Malloc.h \
$(ACE_ROOT)/ace/Malloc_Base.h \
@@ -455,7 +427,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/Mem_Map.h \
$(ACE_ROOT)/ace/Mem_Map.i \
$(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- ../JAWS/Headers.h
+ $(ACE_ROOT)/ace/Message_Block.i ../JAWS/Headers.h \
+ ../HTTPU/http_export.h ../HTTPU/http_headers.i
# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_base.cpp b/apps/JAWS/PROTOTYPE/HTTPU/http_base.cpp
index 7d129e8daea..3a653e5feef 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_base.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_base.cpp
@@ -317,3 +317,7 @@ HTTP_Base::dump (void)
this->status (),
(*HTTP_SCode::instance ())[this->status ()]));
}
+
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# include "HTTPU/http_base.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_base.h b/apps/JAWS/PROTOTYPE/HTTPU/http_base.h
index 4fe57a83217..8b939043cee 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_base.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_base.h
@@ -6,30 +6,16 @@
#include "ace/Message_Block.h"
#include "JAWS/Parse_Headers.h"
+#include "HTTPU/http_export.h"
#include "HTTPU/http_status.h"
#include "HTTPU/http_headers.h"
-class HTTP_Base : public HTTP_SCode_Base
+class HTTPU_Export HTTP_Base : public HTTP_SCode_Base
{
public:
- HTTP_Base (void)
- : status_ (200),
- line_ (0),
- deliver_state_ (0),
- no_headers_ (0),
- iter_ (*(this->info_.table ())),
- mb_ (0)
- {}
- virtual ~HTTP_Base (void)
- {
- if (this->line_)
- ACE_OS::free (this->line_);
- if (this->mb_)
- delete this->mb_;
- this->line_ = 0;
- this->mb_ = 0;
- }
+ HTTP_Base (void);
+ virtual ~HTTP_Base (void);
virtual int receive (ACE_Message_Block &mb);
virtual int deliver (ACE_Message_Block &mb);
@@ -40,10 +26,10 @@ public:
const char * payload (void);
unsigned long payload_size (void);
- int status (void) const { return this->status_; }
- const char *line (void) const { return this->line_; }
- HTTP_Headers *http_headers (void) { return &(this->info_); }
- JAWS_Headers *headers (void) { return this->info_.table (); }
+ int status (void) const;
+ const char *line (void) const;
+ HTTP_Headers *http_headers (void);
+ JAWS_Headers *headers (void);
int build_headers (JAWS_Headers *new_headers);
// takes a set of new headers that will replace existing headers or
@@ -85,4 +71,13 @@ protected:
};
+
+#if defined (ACE_HAS_INLINED_OSCALLS)
+# if defined (ACE_INLINE)
+# undef ACE_INLINE
+# endif /* ACE_INLINE */
+# define ACE_INLINE inline
+# include "HTTPU/http_base.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
+
#endif /* !defined (HTTPU_HTTP_BASE_H) */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_base.i b/apps/JAWS/PROTOTYPE/HTTPU/http_base.i
new file mode 100644
index 00000000000..3c862c5b5fb
--- /dev/null
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_base.i
@@ -0,0 +1,53 @@
+// -*- c++ -*-
+// $Id$
+
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# undef ACE_INLINE
+# define ACE_INLINE
+#endif /* ACE_HAS_INLINED_OSCALLS */
+
+ACE_INLINE
+HTTP_Base::HTTP_Base (void)
+ : status_ (200),
+ line_ (0),
+ deliver_state_ (0),
+ no_headers_ (0),
+ iter_ (*(this->info_.table ())),
+ mb_ (0)
+{
+}
+
+ACE_INLINE
+HTTP_Base::~HTTP_Base (void)
+{
+ if (this->line_)
+ ACE_OS::free (this->line_);
+ if (this->mb_)
+ delete this->mb_;
+ this->line_ = 0;
+ this->mb_ = 0;
+}
+
+ACE_INLINE int
+HTTP_Base::status (void) const
+{
+ return this->status_;
+}
+
+ACE_INLINE const char *
+HTTP_Base::line (void) const
+{
+ return this->line_;
+}
+
+ACE_INLINE HTTP_Headers *
+HTTP_Base::http_headers (void)
+{
+ return &(this->info_);
+}
+
+ACE_INLINE JAWS_Headers *
+HTTP_Base::headers (void)
+{
+ return this->info_.table ();
+}
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_export.h b/apps/JAWS/PROTOTYPE/HTTPU/http_export.h
new file mode 100644
index 00000000000..2a4bc285735
--- /dev/null
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_export.h
@@ -0,0 +1,34 @@
+// $Id$
+
+// Definition for Win32 Export directives.
+// This file is generated automatically by
+// ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
+// ------------------------------
+#if !defined (HTTPU_EXPORT_H)
+#define HTTPU_EXPORT_H
+
+#include "ace/OS.h"
+
+#if defined (HTTPU_HAS_DLL)
+# if (HTTPU_HAS_DLL == 1)
+# if defined (HTTPU_BUILD_DLL)
+# define HTTPU_Export ACE_Proper_Export_Flag
+# define HTTPU_SINGLETON_DECLARATION(T) \
+ ACE_EXPORT_SINGLETON_DECLARATION (T)
+# else
+# define HTTPU_Export ACE_Proper_Import_Flag
+# define HTTPU_SINGLETON_DECLARATION(T) \
+ ACE_IMPORT_SINGLETON_DECLARATION (T)
+# endif /* HTTPU_BUILD_DLL */
+# else
+# define HTTPU_Export
+# define HTTPU_SINGLETON_DECLARATION(T)
+# endif /* ! HTTPU_HAS_DLL == 1 */
+#else
+# define HTTPU_Export
+# define HTTPU_SINGLETON_DECLARATION(T)
+#endif /* HTTPU_HAS_DLL */
+
+#endif /* HTTPU_EXPORT_H */
+ // End of auto generated file.
+
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp
index 2f82e0341ef..5ac580521e5 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp
@@ -124,6 +124,11 @@ HTTP_Headers::value_reset (void)
this->table ()->iter ().first ();
}
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# include "HTTPU/http_headers.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
+
+
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
template class RB_Tree<int, const HTTP_Hdr_Node *>;
template class RB_Tree_Node<int, const HTTP_Hdr_Node *>;
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.h b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.h
index 1d2df99a3e2..ddd3c31972c 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.h
@@ -10,18 +10,19 @@
#include "ace/Singleton.h"
#include "JAWS/Parse_Headers.h"
+#include "HTTPU/http_export.h"
class HTTP_Headers;
-class HTTP_Hdr_Node
+class HTTPU_Export HTTP_Hdr_Node
{
// Constructor should be passed literal strings.
friend class HTTP_HCodes;
public:
- operator const int (void) const { return this->index_; }
- operator const char * (void) const { return this->token_; }
- const char * format (void) const { return this->format_; }
+ operator const int (void) const;
+ operator const char * (void) const;
+ const char * format (void) const;
private:
HTTP_Hdr_Node (const char *token, const char *format);
@@ -35,13 +36,13 @@ private:
class HTTP_HCodes;
-class HTTP_Header_Nodes : public RB_Tree<int, const HTTP_Hdr_Node *>
+class HTTPU_Export HTTP_Header_Nodes : public RB_Tree<int, const HTTP_Hdr_Node *>
{
friend class HTTP_HCodes;
friend class HTTP_Hdr_Node;
public:
- HTTP_Header_Nodes (void) : num_header_strings_ (0) {}
+ HTTP_Header_Nodes (void);
private:
int num_header_strings_;
@@ -50,12 +51,10 @@ private:
typedef ACE_Singleton<HTTP_Header_Nodes, ACE_SYNCH_MUTEX>
HTTP_Header_Nodes_Singleton;
-class HTTP_HCodes
+class HTTPU_Export HTTP_HCodes
{
public:
- HTTP_HCodes (void)
- : header_nodes_ (HTTP_Header_Nodes_Singleton::instance ())
- {}
+ HTTP_HCodes (void);
enum {
REPLACE_HEADER = 1, // Remove any existing header that matches first
@@ -128,20 +127,14 @@ public:
protected:
- const HTTP_Hdr_Node &hcode (int type) const
- {
- const HTTP_Hdr_Node **hn = this->header_nodes_->find (type);
-
- // No error checking!
- return **hn;
- }
+ const HTTP_Hdr_Node &hcode (int type) const;
protected:
HTTP_Header_Nodes *header_nodes_;
};
-class HTTP_Headers : public JAWS_Header_Info, public HTTP_HCodes
+class HTTPU_Export HTTP_Headers : public JAWS_Header_Info, public HTTP_HCodes
{
public:
const char *header( int name ) const;
@@ -150,20 +143,20 @@ public:
void value_reset ( void );
public:
- HTTP_Headers (void) {}
-
- const char *header_token (int name) const
- {
- const HTTP_Hdr_Node **hn = this->header_nodes_->find (name);
- return ((hn && *hn) ? (const char *)**hn : 0);
- }
+ HTTP_Headers (void);
- const char *header_strings (int name) const
- {
- const HTTP_Hdr_Node **hn = this->header_nodes_->find (name);
- return ((hn && *hn) ? (*hn)->format () : 0);
- }
+ const char *header_token (int name) const;
+ const char *header_strings (int name) const;
};
+
+#if defined (ACE_HAS_INLINED_OSCALLS)
+# if defined (ACE_INLINE)
+# undef ACE_INLINE
+# endif /* ACE_INLINE */
+# define ACE_INLINE inline
+# include "HTTPU/http_headers.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
+
#endif /* !defined (HTTPU_HTTP_HEADERS_HPP) */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.i b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.i
new file mode 100644
index 00000000000..e18a7d9064b
--- /dev/null
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.i
@@ -0,0 +1,65 @@
+// -*- c++ -*-
+// $Id$
+
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# undef ACE_INLINE
+# define ACE_INLINE
+#endif /* ACE_HAS_INLINED_OSCALLS */
+
+ACE_INLINE
+HTTP_Hdr_Node::operator const int (void) const
+{
+ return this->index_;
+}
+
+ACE_INLINE
+HTTP_Hdr_Node::operator const char * (void) const
+{
+ return this->token_;
+}
+
+ACE_INLINE const char *
+HTTP_Hdr_Node::format (void) const
+{
+ return this->format_;
+}
+
+ACE_INLINE
+HTTP_Header_Nodes::HTTP_Header_Nodes (void)
+ : num_header_strings_ (0)
+{
+}
+
+ACE_INLINE
+HTTP_HCodes::HTTP_HCodes (void)
+ : header_nodes_ (HTTP_Header_Nodes_Singleton::instance ())
+{
+}
+
+ACE_INLINE const HTTP_Hdr_Node &
+HTTP_HCodes::hcode (int type) const
+{
+ const HTTP_Hdr_Node **hn = this->header_nodes_->find (type);
+
+ // No error checking!
+ return **hn;
+}
+
+ACE_INLINE
+HTTP_Headers::HTTP_Headers (void)
+{
+}
+
+ACE_INLINE const char *
+HTTP_Headers::header_token (int name) const
+{
+ const HTTP_Hdr_Node **hn = this->header_nodes_->find (name);
+ return ((hn && *hn) ? (const char *)**hn : 0);
+}
+
+ACE_INLINE const char *
+HTTP_Headers::header_strings (int name) const
+{
+ const HTTP_Hdr_Node **hn = this->header_nodes_->find (name);
+ return ((hn && *hn) ? (*hn)->format () : 0);
+}
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_request.cpp b/apps/JAWS/PROTOTYPE/HTTPU/http_request.cpp
index 7ab8dca99a4..ac1c08028e0 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_request.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_request.cpp
@@ -80,3 +80,7 @@ HTTP_Request::dump (void)
this->request_.dump ();
ACE_DEBUG ((LM_DEBUG, "===== END entera_HTTP_Request::dump =====\n"));
}
+
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# include "HTTPU/http_request.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_request.h b/apps/JAWS/PROTOTYPE/HTTPU/http_request.h
index 3226b62bb6d..ef10a840461 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_request.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_request.h
@@ -10,26 +10,24 @@
#include "ace/Message_Block.h"
#include "JAWS/Parse_Headers.h"
+#include "HTTPU/http_export.h"
#include "HTTPU/http_base.h"
#include "HTTPU/parse_http_request.h"
#include "HTTPU/parse_url.h"
-class HTTP_Request : public HTTP_Base
+class HTTPU_Export HTTP_Request : public HTTP_Base
{
public:
- HTTP_Request (void) {}
- virtual ~HTTP_Request (void) {}
+ HTTP_Request (void);
+ virtual ~HTTP_Request (void);
- Parse_HTTP_Request *request_line (void) { return &(this->request_); }
+ Parse_HTTP_Request *request_line (void);
// Returns the parsed request line.
- const Parse_HTTP_Request *request_line (void) const
- {
- return &(this->request_);
- }
+ const Parse_HTTP_Request *request_line (void) const;
// Returns the parsed request line.
- HTTP_Parse_URL *url (void) { return &(this->url_); }
+ HTTP_Parse_URL *url (void);
// Returns the parsed url.
void dump (void);
@@ -44,4 +42,13 @@ private:
HTTP_Parse_URL url_;
};
+#if defined (ACE_HAS_INLINED_OSCALLS)
+# if defined (ACE_INLINE)
+# undef ACE_INLINE
+# endif /* ACE_INLINE */
+# define ACE_INLINE inline
+# include "HTTPU/http_request.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
+
+
#endif /* !defined (HTTPU_HTTP_REQUEST_HPP) */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_request.i b/apps/JAWS/PROTOTYPE/HTTPU/http_request.i
new file mode 100644
index 00000000000..7b910da9b84
--- /dev/null
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_request.i
@@ -0,0 +1,35 @@
+// -*- c++ -*-
+// $Id$
+
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# undef ACE_INLINE
+# define ACE_INLINE
+#endif /* ACE_HAS_INLINED_OSCALLS */
+
+ACE_INLINE
+HTTP_Request::HTTP_Request (void)
+{
+}
+
+ACE_INLINE
+HTTP_Request::~HTTP_Request (void)
+{
+}
+
+ACE_INLINE Parse_HTTP_Request *
+HTTP_Request::request_line (void)
+{
+ return &(this->request_);
+}
+
+ACE_INLINE const Parse_HTTP_Request *
+HTTP_Request::request_line (void) const
+{
+ return &(this->request_);
+}
+
+ACE_INLINE HTTP_Parse_URL *
+HTTP_Request::url (void)
+{
+ return &(this->url_);
+}
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_response.cpp b/apps/JAWS/PROTOTYPE/HTTPU/http_response.cpp
index e894b2726f2..380d0155b0f 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_response.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_response.cpp
@@ -43,3 +43,7 @@ HTTP_Response::dump (void)
HTTP_Base::dump ();
ACE_DEBUG ((LM_DEBUG, "===== END entera_HTTP_Response::dump =====\n"));
}
+
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# include "HTTPU/http_response.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_response.h b/apps/JAWS/PROTOTYPE/HTTPU/http_response.h
index cd3a44a4c06..d22f736e4e2 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_response.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_response.h
@@ -10,17 +10,17 @@
#include "ace/Message_Block.h"
#include "JAWS/Parse_Headers.h"
+#include "HTTPU/http_export.h"
#include "HTTPU/http_base.h"
#include "HTTPU/parse_http_response.h"
-class HTTP_Response : public HTTP_Base
+class HTTPU_Export HTTP_Response : public HTTP_Base
{
public:
- HTTP_Response (void) {}
- ~HTTP_Response (void) {}
+ HTTP_Response (void);
+ ~HTTP_Response (void);
- Parse_HTTP_Response *response_line (void)
- { return &(this->response_); }
+ Parse_HTTP_Response *response_line (void);
// Returns the parsed response line.
void dump (void);
@@ -34,4 +34,13 @@ private:
Parse_HTTP_Response response_;
};
+#if defined (ACE_HAS_INLINED_OSCALLS)
+# if defined (ACE_INLINE)
+# undef ACE_INLINE
+# endif /* ACE_INLINE */
+# define ACE_INLINE inline
+# include "HTTPU/http_response.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
+
+
#endif /* !defined (HTTPU_HTTP_RESPONSE_HPP) */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_response.i b/apps/JAWS/PROTOTYPE/HTTPU/http_response.i
new file mode 100644
index 00000000000..9f4eb0d244f
--- /dev/null
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_response.i
@@ -0,0 +1,23 @@
+// -*- c++ -*-
+// $Id$
+
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# undef ACE_INLINE
+# define ACE_INLINE
+#endif /* ACE_HAS_INLINED_OSCALLS */
+
+ACE_INLINE
+HTTP_Response::HTTP_Response (void)
+{
+}
+
+ACE_INLINE
+HTTP_Response::~HTTP_Response (void)
+{
+}
+
+ACE_INLINE Parse_HTTP_Response *
+HTTP_Response::response_line (void)
+{
+ return &(this->response_);
+}
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp b/apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp
index b2bf92c1a55..ae97d2f7fa0 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp
@@ -71,6 +71,11 @@ HTTP_SCode::HTTP_SCode (void)
}
}
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# include "HTTPU/http_status.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
+
+
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
template class ACE_Singleton<HTTP_SCode, ACE_Thread_Mutex>;
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_status.h b/apps/JAWS/PROTOTYPE/HTTPU/http_status.h
index b9f6cb6b33f..47f791675f5 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_status.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_status.h
@@ -5,16 +5,18 @@
#include "ace/Singleton.h"
+#include "HTTPU/http_export.h"
+
class HTTP_SCode_Base;
-class HTTP_SCode_Node
+class HTTPU_Export HTTP_SCode_Node
// Constructor should be passed a string literal.
{
friend class HTTP_SCode_Base;
public:
- operator int (void) const { return this->code_; }
- operator const char * (void) const { return this->code_str_; }
+ operator int (void) const;
+ operator const char * (void) const;
private:
HTTP_SCode_Node (int code, const char *code_str);
@@ -24,7 +26,7 @@ private:
const char *code_str_;
};
-class HTTP_SCode_Base
+class HTTPU_Export HTTP_SCode_Base
{
public:
static HTTP_SCode_Node STATUS_OK;
@@ -56,7 +58,7 @@ private:
static HTTP_SCode_Node DUMMY;
};
-class HTTP_SCode : public HTTP_SCode_Base
+class HTTPU_Export HTTP_SCode : public HTTP_SCode_Base
{
// = TITLE
// Go from numeric status codes to descriptive strings.
@@ -67,7 +69,7 @@ class HTTP_SCode : public HTTP_SCode_Base
protected:
HTTP_SCode (void);
- ~HTTP_SCode (void) {}
+ ~HTTP_SCode (void);
public:
@@ -92,5 +94,12 @@ private:
typedef ACE_Singleton<HTTP_SCode, ACE_SYNCH_MUTEX>
HTTP_SCode_Singleton;
+#if defined (ACE_HAS_INLINED_OSCALLS)
+# if defined (ACE_INLINE)
+# undef ACE_INLINE
+# endif /* ACE_INLINE */
+# define ACE_INLINE inline
+# include "HTTPU/http_status.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
#endif /* HTTPU_HTTP_STATUS_HPP */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_status.i b/apps/JAWS/PROTOTYPE/HTTPU/http_status.i
new file mode 100644
index 00000000000..6af946c39a7
--- /dev/null
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_status.i
@@ -0,0 +1,24 @@
+// -*- c++ -*-
+// $Id$
+
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# undef ACE_INLINE
+# define ACE_INLINE
+#endif /* ACE_HAS_INLINED_OSCALLS */
+
+ACE_INLINE
+HTTP_SCode_Node::operator int (void) const
+{
+ return this->code_;
+}
+
+ACE_INLINE
+HTTP_SCode_Node::operator const char * (void) const
+{
+ return this->code_str_;
+}
+
+ACE_INLINE
+HTTP_SCode::~HTTP_SCode (void)
+{
+}
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.cpp b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.cpp
index 854fe4d7bee..9306ca021ee 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.cpp
@@ -110,3 +110,7 @@ Parse_HTTP_Request::init (const char *request)
else
this->error_ = BAD_REQUEST;
}
+
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# include "HTTPU/parse_http_response.i"
+#endif /* ACE_HAS_INLINED_OS_CALLS */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h
index dcd369fe13d..0f19d9a4919 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h
@@ -6,7 +6,7 @@
#include "ace/OS.h"
#include "HTTPU/http_headers.h"
-class Parse_HTTP_Request : public HTTP_HCodes
+class HTTPU_Export Parse_HTTP_Request : public HTTP_HCodes
{
public:
Parse_HTTP_Request (const char *request = 0);
@@ -14,20 +14,19 @@ public:
void init (const char *request);
- int method (void) const { return (int) *this->method_; }
- const char *method_str (void) const { return (const char *) *this->method_; }
+ int method (void) const;
+ const char *method_str (void) const;
- int major_version (void) const { return this->major_version_; }
- int minor_version (void) const { return this->minor_version_; }
+ int major_version (void) const;
+ int minor_version (void) const;
- const char *version (void) const
- { return this->version_ ? this->version_ : "HTTP/0.9"; }
+ const char *version (void) const;
- const char *url (void) const { return this->url_; }
+ const char *url (void) const;
enum { HTTPU_OK, NO_MEMORY, BAD_REQUEST, NOT_IMPLEMENTED };
- int error (void) { return this->error_; }
+ int error (void) const;
// 0 -> ok
void dump (void);
@@ -44,4 +43,12 @@ private:
};
+#if defined (ACE_HAS_INLINED_OSCALLS)
+# if defined (ACE_INLINE)
+# undef ACE_INLINE
+# endif /* ACE_INLINE */
+# define ACE_INLINE inline
+# include "HTTPU/parse_http_request.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
+
#endif /* !defined (HTTPU_PARSE_HTTP_REQUEST_H) */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.i b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.i
new file mode 100644
index 00000000000..3ef87d48479
--- /dev/null
+++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.i
@@ -0,0 +1,49 @@
+// -*- c++ -*-
+// $Id$
+
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# undef ACE_INLINE
+# define ACE_INLINE
+#endif /* ACE_HAS_INLINED_OSCALLS */
+
+ACE_INLINE int
+Parse_HTTP_Request::method (void) const
+{
+ return (int) *this->method_;
+}
+
+ACE_INLINE const char *
+Parse_HTTP_Request::method_str (void) const
+{
+ return (const char *) *this->method_;
+}
+
+ACE_INLINE int
+Parse_HTTP_Request::major_version (void) const
+{
+ return this->major_version_;
+}
+
+ACE_INLINE int
+Parse_HTTP_Request::minor_version (void) const
+{
+ return this->minor_version_;
+}
+
+ACE_INLINE const char *
+Parse_HTTP_Request::version (void) const
+{
+ return this->version_ ? this->version_ : "HTTP/0.9";
+}
+
+ACE_INLINE const char *
+Parse_HTTP_Request::url (void) const
+{
+ return this->url_;
+}
+
+ACE_INLINE int
+Parse_HTTP_Request::error (void) const
+{
+ return this->error_;
+}
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.cpp b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.cpp
index 1f8ad2eb0f6..4f20ac688d5 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.cpp
@@ -67,3 +67,6 @@ Parse_HTTP_Response::init (const char *response)
this->error_ = BAD_RESPONSE;
}
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# include "HTTPU/parse_http_response.i"
+#endif /* ACE_HAS_INLINED_OS_CALLS */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h
index 7cbf77aa134..a4cbc4490ce 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h
@@ -4,8 +4,9 @@
#define HTTPU_PARSE_HTTP_RESPONSE_H
#include "ace/OS.h"
+#include "HTTPU/http_export.h"
-class Parse_HTTP_Response
+class HTTPU_Export Parse_HTTP_Response
{
public:
Parse_HTTP_Response (const char *response = 0);
@@ -13,19 +14,17 @@ public:
void init (const char *response);
- int code (void) const { return this->code_; }
- const char *code_str (void) const
- { return this->code_str_ ? this->code_str_ : "200"; }
+ int code (void) const;
+ const char *code_str (void) const;
- int major_version (void) const { return this->major_version_; }
- int minor_version (void) const { return this->minor_version_; }
+ int major_version (void) const;
+ int minor_version (void) const;
- const char *version (void) const
- { return this->version_ ? this->version_ : "HTTP/0.9"; }
+ const char *version (void) const;
enum { HTTPU_OK, NO_MEMORY, BAD_RESPONSE };
- int error (void) { return this->error_; }
+ int error (void) const;
// 0 -> ok
private:
@@ -40,4 +39,13 @@ private:
};
+#if defined (ACE_HAS_INLINED_OSCALLS)
+# if defined (ACE_INLINE)
+# undef ACE_INLINE
+# endif /* ACE_INLINE */
+# define ACE_INLINE inline
+# include "HTTPU/parse_http_response.i"
+# endif /* ACE_HAS_INLINED_OSCALLS */
+
+
#endif /* !defined (HTTPU_PARSE_HTTP_RESPONSE_H) */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.i b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.i
new file mode 100644
index 00000000000..57a694377e5
--- /dev/null
+++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.i
@@ -0,0 +1,43 @@
+// -*- c++ -*-
+// $Id$
+
+#if !defined (ACE_HAS_INLINED_OSCALLS)
+# undef ACE_INLINE
+# define ACE_INLINE
+#endif /* ACE_HAS_INLINED_OSCALLS */
+
+ACE_INLINE int
+Parse_HTTP_Response::code (void) const
+{
+ return this->code_;
+}
+
+ACE_INLINE const char *
+Parse_HTTP_Response::code_str (void) const
+{
+ return this->code_str_ ? this->code_str_ : "200";
+}
+
+ACE_INLINE int
+Parse_HTTP_Response::major_version (void) const
+{
+ return this->major_version_;
+}
+
+ACE_INLINE int
+Parse_HTTP_Response::minor_version (void) const
+{
+ return this->minor_version_;
+}
+
+ACE_INLINE const char *
+Parse_HTTP_Response::version (void) const
+{
+ return this->version_ ? this->version_ : "HTTP/0.9";
+}
+
+ACE_INLINE int
+Parse_HTTP_Response::error (void) const
+{
+ return this->error_;
+}
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_url.h b/apps/JAWS/PROTOTYPE/HTTPU/parse_url.h
index fed7ab881b1..66dd4804341 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/parse_url.h
+++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_url.h
@@ -4,7 +4,9 @@
#if !defined (HTTPU_HTTP_PARSE_H)
#define HTTPU_HTTP_PARSE_H
-class HTTP_Parse_URL
+#include "HTTPU/http_export.h"
+
+class HTTPU_Export HTTP_Parse_URL
{
// CAVEAT: