mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Removed some defunct code from the C++1 feature detection macros, and simplified code which no longer needs to test for feature availability

Browse source
This commit is contained in:
jules 2018-01-10 11:43:18 +00:00
parent e5ddf29bf9
commit 8d09eaadb6
25 changed files with 76 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_osc/osc/juce_OSCMessage.cpp
View file

@ -152,7 +152,6 @@ public:
}
#if JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES
beginTest ("Initialisation with argument list (C++11 only)");
{
int testInt = 42;
@ -197,7 +196,6 @@ public:
expectEquals (msg[4].getInt32(), testInt);
}
}
#endif
}
};

18
modules/juce_osc/osc/juce_OSCMessage.h
View file

@ -53,7 +53,6 @@ public:
OSCMessage (const OSCAddressPattern& ap) noexcept;
#if JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES
/** Constructs an OSCMessage object with the given address pattern and list
of arguments.
@ -68,7 +67,6 @@ public:
*/
template <typename Arg1, typename... Args>
OSCMessage (const OSCAddressPattern& ap, Arg1&& arg1, Args&&... args);
#endif
/** Sets the address pattern of the OSCMessage.
@ -143,7 +141,6 @@ public:
private:
//==============================================================================
#if JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES
template <typename Arg1, typename... Args>
void addArguments (Arg1&& arg1, Args&&... args)
{
@ -152,7 +149,6 @@ private:
}
void addArguments() {}
#endif
//==============================================================================
OSCAddressPattern addressPattern;
@ -161,13 +157,11 @@ private:
//==============================================================================
#if JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES
template <typename Arg1, typename... Args>
OSCMessage::OSCMessage (const OSCAddressPattern& ap, Arg1&& arg1, Args&&... args)
: addressPattern (ap)
{
addArguments (std::forward<Arg1> (arg1), std::forward<Args> (args)...);
}
#endif
template <typename Arg1, typename... Args>
OSCMessage::OSCMessage (const OSCAddressPattern& ap, Arg1&& arg1, Args&&... args)
: addressPattern (ap)
{
addArguments (std::forward<Arg1> (arg1), std::forward<Args> (args)...);
}
} // namespace juce

26
modules/juce_osc/osc/juce_OSCSender.h
View file

@ -113,7 +113,6 @@ public:
bool sendToIPAddress (const String& targetIPAddress, int targetPortNumber,
const OSCBundle& bundle);
#if JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES
/** Creates a new OSC message with the specified address pattern and list
of arguments, and sends it to the target.
@ -136,7 +135,6 @@ public:
template <typename... Args>
bool sendToIPAddress (const String& targetIPAddress, int targetPortNumber,
const OSCAddressPattern& address, Args&&... args);
#endif
private:
//==============================================================================
@ -150,19 +148,17 @@ private:
//==============================================================================
#if JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES
template <typename... Args>
bool OSCSender::send (const OSCAddressPattern& address, Args&&... args)
{
return send (OSCMessage (address, std::forward<Args> (args)...));
}
template <typename... Args>
bool OSCSender::send (const OSCAddressPattern& address, Args&&... args)
{
return send (OSCMessage (address, std::forward<Args> (args)...));
}
template <typename... Args>
bool OSCSender::sendToIPAddress (const String& targetIPAddress, int targetPortNumber,
const OSCAddressPattern& address, Args&&... args)
{
return sendToIPAddress (targetIPAddress, targetPortNumber, OSCMessage (address, std::forward<Args> (args)...));
}
#endif // JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES
template <typename... Args>
bool OSCSender::sendToIPAddress (const String& targetIPAddress, int targetPortNumber,
const OSCAddressPattern& address, Args&&... args)
{
return sendToIPAddress (targetIPAddress, targetPortNumber, OSCMessage (address, std::forward<Args> (args)...));
}
} // namespace juce