diff options
| author | David Robillard <d@drobilla.net> | 2008-05-14 20:45:55 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-05-14 20:45:55 +0000 |
| commit | 5fc6f5df54a2650c4a53f04ee38cfebec0a515e1 (patch) | |
| tree | 01146f5aa0c3bd7b659c74dff02f05ee839de117 /src/libs | |
| parent | edf088a15d74ace22c7bf12a160caf98d31fa1d8 (diff) | |
| download | ingen-5fc6f5df54a2650c4a53f04ee38cfebec0a515e1.tar.gz ingen-5fc6f5df54a2650c4a53f04ee38cfebec0a515e1.tar.bz2 ingen-5fc6f5df54a2650c4a53f04ee38cfebec0a515e1.zip | |
Add flag to force disable assembly (some people get compile errors for unknown reasons).
git-svn-id: http://svn.drobilla.net/lad/ingen@1205 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/engine/ConnectionImpl.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/engine.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/util.hpp | 15 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/libs/engine/ConnectionImpl.cpp b/src/libs/engine/ConnectionImpl.cpp index 9cd6f3c9..63f2028c 100644 --- a/src/libs/engine/ConnectionImpl.cpp +++ b/src/libs/engine/ConnectionImpl.cpp @@ -169,7 +169,7 @@ ConnectionImpl::process(ProcessContext& context) } else if (_must_mix && type() == DataType::EVENT) { - cerr << "WARNING: No event mixing." << endl; + std::cerr << "WARNING: No event mixing." << std::endl; } diff --git a/src/libs/engine/engine.cpp b/src/libs/engine/engine.cpp index 17607fa1..45c17354 100644 --- a/src/libs/engine/engine.cpp +++ b/src/libs/engine/engine.cpp @@ -46,7 +46,7 @@ launch_osc_engine(int port) //return SharedPtr<EngineInterface>(new OSCEngineSender( // string("osc.udp://localhost:").append(port_str))); } else { - cerr << "Failed to launch engine process." << endl; + std::cerr << "Failed to launch engine process." << std::endl; //return SharedPtr<EngineInterface>(); return false; } diff --git a/src/libs/engine/util.hpp b/src/libs/engine/util.hpp index 4d03d94e..1daf3554 100644 --- a/src/libs/engine/util.hpp +++ b/src/libs/engine/util.hpp @@ -15,9 +15,10 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef UTIL_H -#define UTIL_H +#ifndef UTIL_HPP +#define UTIL_HPP +#include CONFIG_H_PATH #include <iostream> #include <cstdlib> @@ -26,8 +27,6 @@ #include <xmmintrin.h> #endif -using std::cerr; using std::endl; - namespace Ingen { /** Set flags to disable denormal processing. @@ -35,6 +34,7 @@ namespace Ingen { inline void set_denormal_flags() { +#ifdef USE_ASSEMBLY #ifdef __SSE__ unsigned long a, b, c, d; @@ -60,13 +60,14 @@ set_denormal_flags() //cerr << "Set SSE denormal fix flag." << endl; } } else { - cerr << "This code has been built with SSE support, but your processor does" - << " not support the SSE instruction set." << endl << "Exiting." << endl; + std::cerr << "This code has been built with SSE support, but your processor does" + << " not support the SSE instruction set." << std::endl << "Exiting." << std::endl; exit(EXIT_FAILURE); } #endif +#endif } } // namespace Ingen -#endif // UTIL_H +#endif // UTIL_HPP |