You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2007/07/19 09:26:59 UTC
svn commit: r557508 - in /incubator/tuscany/cpp/sca/runtime/core/src: ./
tuscany/sca/core/ tuscany/sca/util/
Author: robbinspg
Date: Thu Jul 19 00:26:57 2007
New Revision: 557508
URL: http://svn.apache.org/viewvc?view=rev&rev=557508
Log:
TUSCANY-1438 Remove need for tuscany_sca_config.h generated from automake
Set a -DIS_DARWIN compile flag instead
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/Makefile.am
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Exceptions.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Mutex.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Queue.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Thread.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp
Modified: incubator/tuscany/cpp/sca/runtime/core/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/Makefile.am?view=diff&rev=557508&r1=557507&r2=557508
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/Makefile.am Thu Jul 19 00:26:57 2007
@@ -16,6 +16,9 @@
# under the License.
lib_LTLIBRARIES = libtuscany_sca.la
+if DARWIN
+ DARWIN_CPPFLAG = -DIS_DARWIN
+endif
nobase_include_HEADERS = \
tuscany/sca/*.h \
@@ -76,5 +79,5 @@
INCLUDES = -I$(top_builddir)/runtime/core/src \
-I${TUSCANY_SDOCPP}/include
-AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG
+AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG ${DARWIN_CPPFLAG)
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Exceptions.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Exceptions.cpp?view=diff&rev=557508&r1=557507&r2=557508
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Exceptions.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Exceptions.cpp Thu Jul 19 00:26:57 2007
@@ -19,11 +19,6 @@
/* $Rev$ $Date$ */
-#if defined(WIN32) || defined (_WINDOWS)
-#else
-#include "tuscany_sca_config.h"
-#endif
-
#include <sstream>
#if defined(WIN32) || defined (_WINDOWS) || defined (IS_DARWIN)
#else
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp?view=diff&rev=557508&r1=557507&r2=557508
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp Thu Jul 19 00:26:57 2007
@@ -19,12 +19,6 @@
/* $Rev$ $Date$ */
-#if defined(WIN32) || defined (_WINDOWS)
-#include <windows.h>
-#else
-#include "tuscany_sca_config.h"
-#endif
-
#include "tuscany/sca/core/SCARuntime.h"
#include "tuscany/sca/util/Logging.h"
#include "tuscany/sca/util/Utils.h"
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp?view=diff&rev=557508&r1=557507&r2=557508
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp Thu Jul 19 00:26:57 2007
@@ -19,12 +19,6 @@
/* $Rev$ $Date$ */
-#if defined(WIN32) || defined (_WINDOWS)
-#pragma warning(disable: 4786)
-#else
-#include "tuscany_sca_config.h"
-#endif
-
#include <sstream>
#include "tuscany/sca/util/Library.h"
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Mutex.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Mutex.cpp?view=diff&rev=557508&r1=557507&r2=557508
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Mutex.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Mutex.cpp Thu Jul 19 00:26:57 2007
@@ -19,12 +19,6 @@
/* $Rev$ $Date$ */
-#if defined(WIN32) || defined (_WINDOWS)
-#pragma warning(disable: 4786)
-#else
-#include "tuscany_sca_config.h"
-#endif
-
#include <errno.h>
#include <sstream>
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Queue.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Queue.cpp?view=diff&rev=557508&r1=557507&r2=557508
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Queue.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Queue.cpp Thu Jul 19 00:26:57 2007
@@ -19,13 +19,6 @@
/* $Rev: 491752 $ $Date: 2007-01-01 22:22:23 -0800 (Mon, 01 Jan 2007) $ */
-#if defined(WIN32) || defined (_WINDOWS)
-#pragma warning(disable: 4786)
-#pragma warning(disable: 4251)
-#else
-#include "tuscany_sca_config.h"
-#endif
-
#include <errno.h>
#include <sstream>
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Thread.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Thread.cpp?view=diff&rev=557508&r1=557507&r2=557508
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Thread.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Thread.cpp Thu Jul 19 00:26:57 2007
@@ -19,13 +19,6 @@
/* $Rev: 491752 $ $Date: 2007-01-01 22:22:23 -0800 (Mon, 01 Jan 2007) $ */
-#if defined(WIN32) || defined (_WINDOWS)
-#pragma warning(disable: 4786)
-#include <process.h>
-#else
-#include "tuscany_sca_config.h"
-#endif
-
#include <errno.h>
#include <sstream>
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp?view=diff&rev=557508&r1=557507&r2=557508
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp Thu Jul 19 00:26:57 2007
@@ -19,12 +19,6 @@
/* $Rev$ $Date$ */
-#if defined(WIN32) || defined (_WINDOWS)
-#pragma warning(disable: 4786)
-#else
-#include "tuscany_sca_config.h"
-#endif
-
#include <errno.h>
#include <sstream>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org