svn commit: r1031711 - in /qpid/trunk/qpid/cpp/src: CMakeLists.txt qpid/messaging/HandleInstantiator.cpp

[ch...@apache.org]

Author: chug
Date: Fri Nov  5 18:51:00 2010
New Revision: 1031711

URL: http://svn.apache.org/viewvc?rev=1031711&view=rev
Log:
QPID-2926 Simple example code does not link under Windows

This commit provides a windows-only Handle instantiator for the currently known Handle consumers.

Added:
    qpid/trunk/qpid/cpp/src/qpid/messaging/HandleInstantiator.cpp
Modified:
    qpid/trunk/qpid/cpp/src/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1031711&r1=1031710&r2=1031711&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Nov  5 18:51:00 2010
@@ -652,6 +652,10 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
   set (qpidd_platform_SOURCES
     windows/QpiddBroker.cpp
   )
+  
+  set (qpidmessaging_platform_SOURCES
+     qpid/messaging/HandleInstantiator.cpp
+  )
 
 else (CMAKE_SYSTEM_NAME STREQUAL Windows)
 
@@ -718,6 +722,9 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
   set (qpidd_platform_SOURCES
     posix/QpiddBroker.cpp
   )
+
+  set (qpidmessaging_platform_SOURCES
+  )
 endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
 
 set (qpidcommon_SOURCES
@@ -866,6 +873,7 @@ install_pdb (qpidclient ${QPID_COMPONENT
 
 
 set (qpidmessaging_SOURCES
+	 ${qpidmessaging_platform_SOURCES}
      qpid/messaging/Address.cpp
      qpid/messaging/AddressParser.h
      qpid/messaging/AddressParser.cpp

Added: qpid/trunk/qpid/cpp/src/qpid/messaging/HandleInstantiator.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/HandleInstantiator.cpp?rev=1031711&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/HandleInstantiator.cpp (added)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/HandleInstantiator.cpp Fri Nov  5 18:51:00 2010
@@ -0,0 +1,64 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include "qpid/messaging/Connection.h"
+#include "qpid/messaging/Receiver.h"
+#include "qpid/messaging/Sender.h"
+#include "qpid/messaging/Session.h"
+
+namespace qpid {
+namespace messaging {
+
+using namespace qpid::types;
+
+void HandleInstantiatorDoNotCall(void)
+{
+    // This function exists to instantiate various template Handle
+    //  bool functions. The instances are then available to  
+    //  the qpidmessaging DLL and subsequently exported.
+    // This function must not be exported nor called called.
+    // For further information refer to 
+    //  https://issues.apache.org/jira/browse/QPID-2926
+
+    Connection connection;
+    if (connection.isValid()) connection.close();
+    if (connection.isNull() ) connection.close();
+    if (connection          ) connection.close();
+    if (!connection         ) connection.close();
+
+    Receiver receiver;
+    if (receiver.isValid()) receiver.close();
+    if (receiver.isNull() ) receiver.close();
+    if (receiver          ) receiver.close();
+    if (!receiver         ) receiver.close();
+
+    Sender sender;
+    if (sender.isValid()) sender.close();
+    if (sender.isNull() ) sender.close();
+    if (sender          ) sender.close();
+    if (!sender         ) sender.close();
+
+    Session session;
+    if (session.isValid()) session.close();
+    if (session.isNull() ) session.close();
+    if (session          ) session.close();
+    if (!session         ) session.close();
+}
+}} // namespace qpid::messaging



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org